From 7c4d48633bc3bee025a996df888f998317651ec1 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Thu, 24 Mar 2011 10:54:34 -0400
Subject: sss_obfuscate: Avoid traceback on ctrl+d

---
 src/tools/sss_obfuscate | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/tools/sss_obfuscate b/src/tools/sss_obfuscate
index 506e2c410..5a5742b9c 100644
--- a/src/tools/sss_obfuscate
+++ b/src/tools/sss_obfuscate
@@ -41,12 +41,16 @@ def main():
         return 1
 
     if not options.stdin:
-        pprompt = lambda: (getpass.getpass("Enter password: "), getpass.getpass("Re-enter password: "))
-        p1, p2 = pprompt()
-        while p1 != p2:
-            print('Passwords do not match. Try again')
+        try:
+            pprompt = lambda: (getpass.getpass("Enter password: "), getpass.getpass("Re-enter password: "))
             p1, p2 = pprompt()
-        password = p1
+            while p1 != p2:
+                print('Passwords do not match. Try again')
+                p1, p2 = pprompt()
+            password = p1
+        except EOFError:
+            print >> sys.stderr, '\nUnexpected end-of-file. Password change aborted'
+            return 1
 
     else:
         try:
-- 
cgit