From 5d9cc18d67f4247cd113b242d0275395e976c615 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 1 Feb 2011 16:10:19 -0500 Subject: [PATCH 1/2] Make the domain argument mandatory in sss_obfuscate It doesn't make sense to set a "default" domain. We should require that the domain always be specified. --- src/tools/sss_obfuscate | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/tools/sss_obfuscate b/src/tools/sss_obfuscate index cd91161515b1db62dba3b3f7f0b4db88970a07e0..faa2d981a367b390e90a9a6d9e00e77f7e1aaf6a 100644 --- a/src/tools/sss_obfuscate +++ b/src/tools/sss_obfuscate @@ -19,8 +19,8 @@ def parse_options(): dest="stdin", default=False, help="Read the password from stdin.") parser.add_option("-d", "--domain", - dest="domain", default="default", - help="The domain to use the password in (default: default)", + dest="domain", default=None, + help="The domain to use the password in (mandatory)", metavar="DOMNAME") parser.add_option("-f", "--file", dest="filename", default=None, @@ -40,6 +40,10 @@ def main(): print >> sys.stderr, "Cannot parse options" return 1 + if not options.domain: + print >> sys.stderr, "No domain specified" + return 1 + if not options.stdin and not options.password: pprompt = lambda: (getpass.getpass("Enter password: "), getpass.getpass("Re-enter password: ")) p1, p2 = pprompt() -- 1.7.3.5