diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2011-03-24 10:54:34 -0400 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2011-03-24 14:14:02 -0400 |
| commit | 7c4d48633bc3bee025a996df888f998317651ec1 (patch) | |
| tree | 6a8e7813d5ff99ae534d05637feccb59f69f1bbb | |
| parent | 34e67636d5b78834431d6852cea7b0fc205aa5cb (diff) | |
| download | sssd-7c4d48633bc3bee025a996df888f998317651ec1.tar.gz sssd-7c4d48633bc3bee025a996df888f998317651ec1.tar.xz sssd-7c4d48633bc3bee025a996df888f998317651ec1.zip | |
sss_obfuscate: Avoid traceback on ctrl+d
| -rw-r--r-- | src/tools/sss_obfuscate | 14 |
1 files 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: |