summaryrefslogtreecommitdiffstats
path: root/ipa-client/ipa-install
diff options
context:
space:
mode:
authorAna Krivokapic <akrivoka@redhat.com>2013-06-05 15:52:47 +0200
committerMartin Kosek <mkosek@redhat.com>2013-06-20 12:24:01 +0200
commitcaf40e76cdca806be1849f70a81363289a96d454 (patch)
treec4eb6b7cfdffbdf6d0a02912bed0a50a705c4b65 /ipa-client/ipa-install
parent7eb6d8cb141760b51846f9679112f706003de08b (diff)
downloadfreeipa-caf40e76cdca806be1849f70a81363289a96d454.tar.gz
freeipa-caf40e76cdca806be1849f70a81363289a96d454.tar.xz
freeipa-caf40e76cdca806be1849f70a81363289a96d454.zip
Improve handling of options in ipa-client-install
Improve handling of command line options related to forced client re-enrollment in ipa-client-install: * Make --keytab and --principal options mutually exclusive. * Warn that using --force-join together with --keytab provides no additional functionality. https://fedorahosted.org/freeipa/ticket/3686
Diffstat (limited to 'ipa-client/ipa-install')
-rwxr-xr-xipa-client/ipa-install/ipa-client-install9
1 files changed, 9 insertions, 0 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index e86564ddd..a5ba46cfc 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -1844,6 +1844,15 @@ def install(options, env, fstore, statestore):
"nss_ldap or nss-pam-ldapd")
return CLIENT_INSTALL_ERROR
+ if options.keytab and options.principal:
+ root_logger.error("Options 'principal' and 'keytab' cannot be used "
+ "together.")
+ return CLIENT_INSTALL_ERROR
+
+ if options.keytab and options.force_join:
+ root_logger.warning("Option 'force-join' has no additional effect "
+ "when used with together with option 'keytab'.")
+
# Create the discovery instance
ds = ipadiscovery.IPADiscovery()