starlingx/integ
Code Issues Proposed changes

rebase openldap patch to CentOS 7.6 version

Browse Source 
Test:
Pass build and simplex deploy test

Depends-On: https://review.openstack.org/626503

Story: 2004522
Task: 28398

Change-Id: If4ba828526724f7888a39d9bb5fb15cd7c6c5815
Signed-off-by: Zhe Hu <zhe.hu@intel.com>
This commit is contained in:
Zhe Hu 2018-12-20 15:52:10 +08:00
parent 2141fc213e
commit eb96c9a6e9
5 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ldap/openldap/centos/meta_patches/Update-package-versioning-for-TIS-format.patch
View File

@ -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

6
ldap/openldap/centos/meta_patches/openldap-enable-password-policy.patch
View File

@ -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 <<EOF
# OpenLDAP pwdChecker library configuration

8
ldap/openldap/centos/meta_patches/openldap-spec-file.patch
View File

@ -11,7 +11,7 @@ diff --git a/SPECS/openldap.spec b/SPECS/openldap.spec
index 85abac9..66a1377 100644
--- a/SPECS/openldap.spec
+++ b/SPECS/openldap.spec
@@ -296,7 +296,7 @@ mv check_password.so check_password.so.%{check_password_version}
@@ -308,7 +308,7 @@ mv check_password.so check_password.so.%{check_password_version}
ln -s check_password.so.%{check_password_version} %{buildroot}%{_libdir}/openldap/check_password.so
install -m 755 check_password.so.%{check_password_version} %{buildroot}%{_libdir}/openldap/
# install -m 644 README %{buildroot}%{_libdir}/openldap
@ -20,7 +20,7 @@ index 85abac9..66a1377 100644
cat > %{buildroot}%{_sysconfdir}/openldap/check_password.conf <<EOF
# OpenLDAP pwdChecker library configuration
@@ -432,6 +432,7 @@ exit 0
@@ -444,6 +444,7 @@ exit 0
%post servers
/sbin/ldconfig -n %{_libdir}/openldap
@ -28,7 +28,7 @@ index 85abac9..66a1377 100644
%systemd_post slapd.service
@@ -442,7 +443,6 @@ exit 0
@@ -454,7 +455,6 @@ exit 0
if [ ! -f %{_sysconfdir}/openldap/slapd.d/cn=config.ldif ]; then
if [ -f %{_sysconfdir}/openldap/slapd.conf ]; then
%{_libexecdir}/openldap/convert-config.sh &>/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

10
ldap/openldap/centos/patches/rootdn-should-not-bypass-ppolicy.patch
View File

@ -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;

2
ldap/openldap/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/openldap-2.4.44-15.el7_5.src.rpm
mirror:Source/openldap-2.4.44-20.el7.src.rpm