diff options
| -rw-r--r-- | freeipa.spec.in | 9 | ||||
| -rwxr-xr-x | ipa-client/ipa-install/ipa-client-install | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/freeipa.spec.in b/freeipa.spec.in index a10d80e1a..36e2a615c 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -161,6 +161,10 @@ Conflicts: bind-dyndb-ldap < 1.1.0-0.12.rc1 %endif Conflicts: bind < 9.8.2-0.4.rc2 +# Versions of nss-pam-ldapd < 0.8.4 require a mapping from uniqueMember to +# member. +Conflicts: nss-pam-ldapd < 0.8.4 + # mod_proxy provides a single API to communicate over SSL. If mod_ssl # is even loaded into Apache then it grabs this interface. Conflicts: mod_ssl @@ -835,6 +839,11 @@ fi %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt %changelog +* Tue Apr 30 2013 Rob Crittenden <rcritten@redhat.com> - 3.1.99-9 +- Add Conflicts on nss-pam-ldapd < 0.8.4. The mapping from uniqueMember to + member is now done automatically and having it in the config file raises + an error. + * Tue Apr 30 2013 Jan Cholasta <jcholast@redhat.com> - 3.1.99-8 - Add triggerin scriptlet to update sshd_config on openssh-server update diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index 385e47257..74523632a 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -778,7 +778,6 @@ def configure_nslcd_conf(fstore, cli_basedn, cli_realm, cli_domain, cli_server, {'name':'empty', 'type':'empty'}, {'name':'base passwd', 'type':'option', 'value':str(DN(('cn', 'users'), ('cn', 'accounts'), cli_basedn))}, {'name':'base group', 'type':'option', 'value':str(DN(('cn', 'groups'), ('cn', 'accounts'), cli_basedn))}, - {'name':'map group', 'type':'option', 'value':'uniqueMember member'}, {'name':'timelimit', 'type':'option', 'value':'15'}, {'name':'empty', 'type':'empty'}] if not dnsok or options.force or options.on_master: |