diff --git a/ldap/openldap/centos/meta_patches/Update-package-versioning-for-TIS-format.patch b/ldap/openldap/centos/meta_patches/Update-package-versioning-for-TIS-format.patch index 407283f8f..09f2e10f9 100644 --- a/ldap/openldap/centos/meta_patches/Update-package-versioning-for-TIS-format.patch +++ b/ldap/openldap/centos/meta_patches/Update-package-versioning-for-TIS-format.patch @@ -17,8 +17,8 @@ index c38f1bd..d35d73f 100644 Name: openldap Version: 2.4.44 --Release: 15%{?dist} -+Release: 15.el7_5%{?_tis_dist}.%{tis_patch_ver} +-Release: 20%{?dist} ++Release: 20.el7%{?_tis_dist}.%{tis_patch_ver} Summary: LDAP support libraries Group: System Environment/Daemons License: OpenLDAP diff --git a/ldap/openldap/centos/meta_patches/openldap-enable-password-policy.patch b/ldap/openldap/centos/meta_patches/openldap-enable-password-policy.patch index 7ec88d097..0163f23b3 100644 --- a/ldap/openldap/centos/meta_patches/openldap-enable-password-policy.patch +++ b/ldap/openldap/centos/meta_patches/openldap-enable-password-policy.patch @@ -11,7 +11,7 @@ diff --git a/SPECS/openldap.spec b/SPECS/openldap.spec index 66a1377..468ca0e 100644 --- a/SPECS/openldap.spec +++ b/SPECS/openldap.spec -@@ -64,6 +64,9 @@ Patch101: openldap-tlsmc.patch +@@ -71,6 +71,9 @@ Patch101: openldap-tlsmc.patch # Fedora specific patches Patch102: openldap-fedora-systemd.patch @@ -21,7 +21,7 @@ index 66a1377..468ca0e 100644 BuildRequires: cyrus-sasl-devel, nss-devel, openssl-devel, krb5-devel, tcp_wrappers-devel, unixODBC-devel BuildRequires: glibc-devel, libtool, libtool-ltdl-devel, groff, perl, perl-devel, perl(ExtUtils::Embed) Requires: nss-tools -@@ -178,6 +181,9 @@ AUTOMAKE=%{_bindir}/true autoreconf -fi +@@ -190,6 +193,9 @@ AUTOMAKE=%{_bindir}/true autoreconf -fi %patch102 -p1 @@ -31,7 +31,7 @@ index 66a1377..468ca0e 100644 # build smbk5pwd with other overlays ln -s ../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays mv contrib/slapd-modules/smbk5pwd/README contrib/slapd-modules/smbk5pwd/README.smbk5pwd -@@ -302,12 +308,12 @@ install -d -m 740 %{buildroot}%{_sysconfdir}/openldap +@@ -312,12 +318,12 @@ install -d -m 740 %{buildroot}%{_sysconfdir}/openldap cat > %{buildroot}%{_sysconfdir}/openldap/check_password.conf < %{buildroot}%{_sysconfdir}/openldap/check_password.conf </dev/null @@ -36,7 +36,7 @@ index 85abac9..66a1377 100644 else %{_libexecdir}/openldap/convert-config.sh -f %{_datadir}/openldap-servers/slapd.ldif &>/dev/null fi -@@ -641,8 +641,8 @@ exit 0 +@@ -653,8 +653,8 @@ exit 0 %{_mandir}/man5/slapd*.5* %{_mandir}/man5/slapo-*.5* # obsolete configuration diff --git a/ldap/openldap/centos/patches/rootdn-should-not-bypass-ppolicy.patch b/ldap/openldap/centos/patches/rootdn-should-not-bypass-ppolicy.patch index 38e839244..797c8ad1f 100644 --- a/ldap/openldap/centos/patches/rootdn-should-not-bypass-ppolicy.patch +++ b/ldap/openldap/centos/patches/rootdn-should-not-bypass-ppolicy.patch @@ -4,20 +4,18 @@ Date: Tue, 11 Apr 2017 17:23:03 -0400 Subject: [PATCH] rootdn should not bypass ppolicy --- - servers/slapd/overlays/ppolicy.c | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) + servers/slapd/overlays/ppolicy.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c index b446deb..fa79872 100644 --- a/servers/slapd/overlays/ppolicy.c +++ b/servers/slapd/overlays/ppolicy.c -@@ -1904,8 +1904,9 @@ ppolicy_modify( Operation *op, SlapReply *rs ) - } +@@ -1905,7 +1905,8 @@ ppolicy_modify( Operation *op, SlapReply *rs ) for(p=tl; p; p=p->next, hsize++); /* count history size */ } -- + - if (be_isroot( op )) goto do_modify; -+ + /* WRS UPDATE: Run ppolicy for all user password modify ops */ + //if (be_isroot( op )) goto do_modify; diff --git a/ldap/openldap/centos/srpm_path b/ldap/openldap/centos/srpm_path index 9ca4a1169..76892ba0e 100644 --- a/ldap/openldap/centos/srpm_path +++ b/ldap/openldap/centos/srpm_path @@ -1 +1 @@ -mirror:Source/openldap-2.4.44-15.el7_5.src.rpm +mirror:Source/openldap-2.4.44-20.el7.src.rpm