Handle a ctrl-C gracefully while getting the new password

Resolves 433053

1 files changed, 18 insertions, 13 deletions

diff --git a/ipa-admintools/ipa-passwd b/ipa-admintools/ipa-passwd
index 1e658a85b..44f3ed2a6 100644
--- a/ipa-admintools/ipa-passwd
+++ b/ipa-admintools/ipa-passwd
@@ -86,19 +86,24 @@ def main():
 
     print "Changing password for %s" % principal
 
-    while (match != True):
-        # No syntax checking of the password is required because that is done
-        # on the server side
-        password = getpass.getpass("  New Password: ")
-        confirm = getpass.getpass("  Confirm Password: ")
-        if (password != confirm):
-            print "Passwords do not match"
-            match = False
-        elif (len(password) < 1):
-            print "Password cannot be empty"
-            match = False
-        else:
-            match = True
+    try:
+        while (match != True):
+            # No syntax checking of the password is required because that is
+            # done on the server side
+            password = getpass.getpass("  New Password: ")
+            confirm = getpass.getpass("  Confirm Password: ")
+            if (password != confirm):
+                print "Passwords do not match"
+                match = False
+            elif (len(password) < 1):
+                print "Password cannot be empty"
+                match = False
+            else:
+                match = True
+    except KeyboardInterrupt:
+        print ""
+        print "Password change cancelled"
+        return 1
 
     try:
         client = ipaclient.IPAClient()