summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2008-02-25 17:18:18 -0500
committerSimo Sorce <ssorce@redhat.com>2008-02-25 17:18:18 -0500
commitd2fd2270cd63a4e51f0d51987f46f3bae7a959c4 (patch)
tree45203f18c41fd7bf790e305ade4cfe8b0d052a3a
parente50f0fdbeed3df1838edeac363e869860615aab7 (diff)
downloadfreeipa-d2fd2270cd63a4e51f0d51987f46f3bae7a959c4.tar.gz
freeipa-d2fd2270cd63a4e51f0d51987f46f3bae7a959c4.tar.xz
freeipa-d2fd2270cd63a4e51f0d51987f46f3bae7a959c4.zip
We do not require the Master password anymore, fix code and error message
-rw-r--r--ipa-server/ipa-install/ipa-server-install7
1 files changed, 3 insertions, 4 deletions
diff --git a/ipa-server/ipa-install/ipa-server-install b/ipa-server/ipa-install/ipa-server-install
index 1d15519ef..77787b158 100644
--- a/ipa-server/ipa-install/ipa-server-install
+++ b/ipa-server/ipa-install/ipa-server-install
@@ -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