From 314f498c5bd553e1e6a38751c1f222d15a4fe716 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Mon, 11 Apr 2011 13:58:39 -0400 Subject: [PATCH] Suppress --on-master from ipa-client-install command-line and man page. This option is only used when configuring an IPA client on an IPA server. Describing it on the command-line will only confuse people so don't list it as an option. Ticket 1050 --- ipa-client/ipa-install/ipa-client-install | 5 ++++- ipa-client/man/ipa-client-install.1 | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index c00b919..606bf68 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -40,6 +40,7 @@ try: from ipapython.config import IPAOptionParser import SSSDConfig from ConfigParser import RawConfigParser + from optparse import SUPPRESS_HELP except ImportError: print >> sys.stderr, """\ There was a problem importing one of the required Python modules. The @@ -75,8 +76,10 @@ def parse_options(): help="Prompt for a password to join the IPA realm"), parser.add_option("-p", "--principal", dest="principal", help="principal to use to join the IPA realm"), + # --on-master is used in ipa-server-install and ipa-replica-install + # only, it isn't meant to be used on clients. parser.add_option("--on-master", dest="on_master", action="store_true", - help="use this option when run on a master", default=False) + help=SUPPRESS_HELP, default=False) parser.add_option("--permit", dest="permit", action="store_true", help="disable access rules by default, permit all access.", default=False) parser.add_option("--mkhomedir", dest="mkhomedir", action="store_true", diff --git a/ipa-client/man/ipa-client-install.1 b/ipa-client/man/ipa-client-install.1 index 90a4f71..07f08ed 100644 --- a/ipa-client/man/ipa-client-install.1 +++ b/ipa-client/man/ipa-client-install.1 @@ -61,9 +61,6 @@ Configure ntpd to use this NTP server. \fB\-S\fR, \fB\-\-no\-sssd\fR Do not configure the client to use SSSD for authentication, use nss_ldap instead. .TP -\fB\-\-on\-master\fB -The client is being configured on an IPA server. -.TP \fB\-w\fR \fIPASSWORD\fR, \fB\-\-password\fR=\fIPASSWORD\fR Password for joining a machine to the IPA realm. Assumes bulk password unless principal is also set. .TP -- 1.7.4