IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improve handling of options in ipa-client-install

Browse Source 
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
This commit is contained in:
Ana Krivokapic 2013-06-05 15:52:47 +02:00 committed by Martin Kosek
parent 7eb6d8cb14
commit caf40e76cd
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ipa-client/ipa-install/ipa-client-install
View File

@ -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()