We do not require the Master password anymore, fix code and error message

This commit is contained in:
Simo Sorce
2008-02-25 17:18:18 -05:00
parent e50f0fdbee
commit d2fd2270cd

View File

@@ -62,7 +62,7 @@ def parse_options():
parser.add_option("-p", "--ds-password", dest="dm_password",
help="admin password")
parser.add_option("-P", "--master-password", dest="master_password",
help="kerberos master password")
help="kerberos master password (normally autogenerated)")
parser.add_option("-a", "--admin-password", dest="admin_password",
help="admin user kerberos password")
parser.add_option("-d", "--debug", dest="debug", action="store_true",
@@ -87,9 +87,8 @@ def parse_options():
parser.error("error: In uninstall mode, -u, r, -p and -P options are not allowed")
elif options.unattended:
if (not options.ds_user or not options.realm_name or
not options.dm_password or not options.admin_password or
not options.master_password):
parser.error("error: In unattended mode you need to provide at least -u, -r, -p and -P options")
not options.dm_password or not options.admin_password):
parser.error("error: In unattended mode you need to provide at least -u, -r, -p and -a options")
return options