summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabe <redhatrises@gmail.com>2014-05-14 08:21:34 -0600
committerPetr Viktorin <pviktori@redhat.com>2014-05-16 11:13:54 +0200
commit98102832789412f567a96693dfe27b0e00cc98e5 (patch)
tree74cda821e1e72c7cc76de2035c5c1014d9a09e0e
parent2478aa42a0cc3b9a061c6a281a99f6acb9b84fca (diff)
downloadfreeipa-98102832789412f567a96693dfe27b0e00cc98e5.zip
freeipa-98102832789412f567a96693dfe27b0e00cc98e5.tar.gz
freeipa-98102832789412f567a96693dfe27b0e00cc98e5.tar.xz
ipa-client-automount should not configure nsswitch.conf manually
https://fedorahosted.org/freeipa/ticket/3733 Reviewed-By: Petr Viktorin <pviktori@redhat.com>
-rwxr-xr-xipa-client/ipa-install/ipa-client-automount11
1 files changed, 5 insertions, 6 deletions
diff --git a/ipa-client/ipa-install/ipa-client-automount b/ipa-client/ipa-install/ipa-client-automount
index 861e924..43b8a1a 100755
--- a/ipa-client/ipa-install/ipa-client-automount
+++ b/ipa-client/ipa-install/ipa-client-automount
@@ -129,17 +129,15 @@ def configure_xml(fstore):
def configure_nsswitch(fstore, options):
"""
- Point automount to ldap in nsswitch.conf
+ Point automount to ldap in nsswitch.conf. This function is for non-SSSD
+ setups only
"""
fstore.backup_file(NSSWITCH_CONF)
conf = ipachangeconf.IPAChangeConf("IPA Installer")
conf.setOptionAssignment(':')
- if options.sssd:
- nss_value = ' sss files'
- else:
- nss_value = ' ldap files'
+ nss_value = ' files ldap'
opts = [{'name':'automount', 'type':'option', 'action':'set', 'value':nss_value},
{'name':'empty', 'type':'empty'}]
@@ -459,7 +457,8 @@ def main():
sys.exit("Installation aborted")
try:
- configure_nsswitch(fstore, options)
+ if not options.sssd:
+ configure_nsswitch(fstore, options)
configure_nfs(fstore, statestore)
if options.sssd:
configure_autofs_sssd(fstore, statestore, autodiscover, options)