client installation fixes: nscd, sssd min version, bogus join error

- Don't run nscd if using sssd, the caching of nscd conflicts with sssd
- Set the minimum version of sssd to 1.1.1 to pick up needed hbac fixes
- only try to read the file configuration if the server isn't passed in

1 files changed, 22 insertions, 10 deletions

diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index 5dbeee4b..0be4a4c3 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -127,7 +127,7 @@ def uninstall(options):
         run(["/usr/bin/ipa-getcert", "stop-tracking", "-d", "/etc/pki/nssdb", "-n", "Server-Cert"])
     except Exception, e:
         print "Failed to stop tracking Server-Cert in certmonger: %s" % str(e)
- 
+
     try:
         run(["/sbin/service", "certmonger", "stop"])
     except:
@@ -160,6 +160,11 @@ def uninstall(options):
     except:
         print "Failed to restart start the NSCD daemon"
 
+    try:
+        run(["/sbin/chkconfig", "nscd", "on"])
+    except:
+        print "Failed to configure automatic startup of the NSCD daemon"
+
     if not options.unattended:
         print "The original nsswitch.conf configuration has been restored."
         print "You may need to restart services or reboot the machine."
@@ -575,7 +580,7 @@ def main():
                 return 1
 
     #Modify pam to add pam_krb5
-    run(["/usr/sbin/authconfig", "--enablekrb5", "--update"])
+    run(["/usr/sbin/authconfig", "--enablekrb5", "--update", "--nostart"])
     print "Kerberos 5 enabled"
 
     if options.conf_ntp and not options.on_master:
@@ -586,20 +591,27 @@ def main():
         ipaclient.ntpconf.config_ntp(ntp_server, fstore)
         print "NTP enabled"
 
-    #Activate Name Server Caching Daemon
+    if options.sssd:
+        nscd_action = "stop"
+        nscd_status = "off"
+    else:
+        nscd_action = "restart"
+        nscd_status = "on"
+
+    #Name Server Caching Daemon. Disable for SSSD, use otherwise
     try:
-        run(["/sbin/service", "nscd", "restart"])
+        run(["/sbin/service", "nscd", nscd_action])
     except:
-        print "Failed to start the NSCD daemon"
-        print "Caching of users/groups will not be available"
-        pass
+        print "Failed to %s the NSCD daemon" % nscd_action
+        if not options.sssd:
+            print "Caching of users/groups will not be available"
 
     try:
-        run(["/sbin/chkconfig", "nscd", "on"])
+        run(["/sbin/chkconfig", "nscd", nscd_status])
     except:
         print "Failed to configure automatic startup of the NSCD daemon"
-        print "Caching of users/groups will not be available after reboot"
-        pass
+        if not options.sssd:
+            print "Caching of users/groups will not be available after reboot"
 
     print "Client configuration complete."