diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2011-10-14 11:29:35 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2011-10-13 20:45:06 -0400 |
| commit | 814a424a37c715f0fd14e88282271d29d3d1fd94 (patch) | |
| tree | d636db088b55a29d40425c55142fcee4db94df4f | |
| parent | 447ce62966b70a2af02f21cfd86e8d4886bd26cd (diff) | |
| download | freeipa-814a424a37c715f0fd14e88282271d29d3d1fd94.tar.gz freeipa-814a424a37c715f0fd14e88282271d29d3d1fd94.tar.xz freeipa-814a424a37c715f0fd14e88282271d29d3d1fd94.zip | |
Update all LDAP configuration files that we can.
LDAP can be configured in any number of places, we need to update everything
we find.
https://fedorahosted.org/freeipa/ticket/1986
| -rwxr-xr-x | ipa-client/ipa-install/ipa-client-install | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index fd927d225..feabf88d1 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -459,6 +459,7 @@ def configure_ldap_conf(fstore, cli_basedn, cli_realm, cli_domain, cli_server, d opts.append({'name':'empty', 'type':'empty'}) ret = (0, None, None) + files = [] # Depending on the release and distribution this may exist in any # number of different file names, update what we find for filename in ['/etc/ldap.conf', '/etc/nss_ldap.conf', '/etc/libnss-ldap.conf', '/etc/pam_ldap.conf']: @@ -466,11 +467,13 @@ def configure_ldap_conf(fstore, cli_basedn, cli_realm, cli_domain, cli_server, d try: fstore.backup_file(filename) ldapconf.newConf(filename, opts) - return (0, 'LDAP', filename) + files.append(filename) except Exception, e: print "Creation of %s: %s" % (filename, str(e)) return (1, 'LDAP', filename) + if files: + return (0, 'LDAP', ', '.join(files)) return ret def configure_nslcd_conf(fstore, cli_basedn, cli_realm, cli_domain, cli_server, dnsok, options): @@ -1186,7 +1189,7 @@ def install(options, env, fstore, statestore): if retcode: return CLIENT_INSTALL_ERROR if conf: - print "%s configured using configuration file %s" % (conf, filename) + print "%s configured using configuration file(s) %s" % (conf, filename) #Check that nss is working properly if not options.on_master: |