Initialize map lock in NIS plugin

New upstream release
(cherry picked from commit 461588afaf)
2020-05-06 14:50:27 +03:00 · 2020-05-04 13:55:30 +03:00 · 2020-03-10 13:06:48 +02:00
5 changed files with 58 additions and 93 deletions
--- a/.gitignore
+++ b/.gitignore
@ -81,9 +81,3 @@ slapi-nis-0.17.tar.gz
 /slapi-nis-0.56.4.tar.gz.sig
 /slapi-nis-0.56.5.tar.gz
 /slapi-nis-0.56.5.tar.gz.asc
-/slapi-nis-0.56.6.tar.gz
-/slapi-nis-0.56.6.tar.gz.asc
-/slapi-nis-0.56.7.tar.gz
-/slapi-nis-0.56.7.tar.gz.asc
-/slapi-nis-0.60.0.tar.gz
-/slapi-nis-0.60.0.tar.gz.asc
--- a/slapi-nis-bz1832190.patch
+++ b/slapi-nis-bz1832190.patch
@ -0,0 +1,49 @@
+From e8c3ed416a442f5a431ca48f7ea384a6abc1fa53 Mon Sep 17 00:00:00 2001
+From: Alexander Bokovoy <abokovoy@redhat.com>
+Date: Wed, 6 May 2020 14:08:41 +0300
+Subject: [PATCH] Initialize map lock in NIS plugin as well
+
+Also if ignored_containers_sdn is NULL, we don't really need to check
+whether a write could be ignored. It has to be processed, so bail out
+early with FALSE.
+
+Resolves: rhbz#1832190
+
+Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
+---
+ src/back-shr.c | 4 ++++
+ src/plug-nis.c | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/src/back-shr.c b/src/back-shr.c
+index e2b5dd3..c6a181e 100644
+--- a/src/back-shr.c
+++ b/src/back-shr.c
+@@ -2960,6 +2960,10 @@ backend_shr_write_ignore(Slapi_PBlock *pb)
+     int i = 0;
+     PRBool ignore = PR_FALSE;
+ 
+    if (ignored_containers_sdn == NULL) {
+        return ignore;
+    }
+
+     /* Check if the target DN is a subordinates of
+      * on of the ignored containers
+      */
+diff --git a/src/plug-nis.c b/src/plug-nis.c
+index ee90c37..0ce4ae6 100644
+--- a/src/plug-nis.c
+++ b/src/plug-nis.c
+@@ -540,6 +540,9 @@ nis_plugin_init(Slapi_PBlock *pb)
+ 				"error setting up plugin\n");
+ 		return -1;
+ 	}
+
+	init_map_lock();
+
+ 	/* Read global configuration. */
+ 	if ((slapi_pblock_get(pb, SLAPI_PLUGIN_CONFIG_ENTRY,
+ 			      &plugin_entry) == 0) &&
+-- 
+2.25.4
+
--- a/slapi-nis-openldap-2.6.patch
+++ b/slapi-nis-openldap-2.6.patch
@ -1,36 +0,0 @@
-From 610cf4ce34ad850eda67d9fba1f98f8ab6001e6e Mon Sep 17 00:00:00 2001
-From: Alexander Bokovoy <abokovoy@redhat.com>
-Date: Tue, 1 Feb 2022 08:28:18 +0200
-Subject: [PATCH] Update OpenLDAP detection code to deal with libldap_r removal
- in 2.6
-
-Resolves: rhbz#2032691
-
-Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
---
- configure.ac | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7cd7d76..24fbe20 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -71,8 +71,13 @@ dirsrv)
- 		;;
- 	openldap)
- 		runtime_modules="nss nspr"
-		LDAP_CFLAGS=
-		LDAP_LIBS="-lldap_r -llber"
-+		SAVE_LIBS="$LIBS"
-+		LIBS=
-+		AC_SEARCH_LIBS([ldap_search], [ldap_r ldap], [], [AC_MSG_ERROR([libldap or libldap_r not found])])
-+		AC_SEARCH_LIBS([ber_peek_tag], [lber], [], [AC_MSG_ERROR([liblber not found])])
-+		LDAP_LIBS="$LIBS"
-+		LDAP_CFLAGS=""
-+		LIBS="$SAVE_LIBS"
- 		;;
- 	*)
- 		runtime_modules="nss nspr"
-- 
-2.34.1
-
--- a/slapi-nis.spec
+++ b/slapi-nis.spec
@ -10,15 +10,14 @@
 %endif

 Name:		slapi-nis
-Version:	0.60.0
-Release:	1%{?dist}
+Version:	0.56.5
+Release:	2%{?dist}
 Summary:	NIS Server and Schema Compatibility plugins for Directory Server
-License:	GPL-3.0-or-later
+License:	GPLv2
 URL:		http://pagure.io/slapi-nis/
 Source0:	https://releases.pagure.org/slapi-nis/slapi-nis-%{version}.tar.gz
 Source1:	https://releases.pagure.org/slapi-nis/slapi-nis-%{version}.tar.gz.asc
-
-BuildRequires: make
+Patch1:		slapi-nis-bz1832190.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@ -36,7 +35,7 @@ BuildRequires:	libtirpc-devel
 %else
 BuildRequires:  libnsl2-devel
 %endif
-%if 0%{?fedora} > 27 || 0%{?rhel} >= 9
+%if 0%{?fedora} > 27
 ExcludeArch: %{ix86}
 %endif
 Requires: 389-ds-base >= 1.3.5.6
@ -56,6 +55,7 @@ for attributes from multiple entries in the tree.

 %prep
 %setup -q
+%patch1 -p1

 %build
 autoconf --force
@ -83,43 +83,6 @@ make check
 %{_sbindir}/nisserver-plugin-defs

 %changelog
-* Sat Aug 20 2022 Alexander Bokovoy <abokovoy@redhat.com> - 0.60.0-1
- new upstream release
- Change license from GPLv2 to GPLv3+ to follow 389-ds licensing
- Fix ID views integration
- Fix base scope lookups
- Bump NIS max dgram size to 8KB by default instead of 1KB
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.7-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue Feb 01 2022 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.7-5
- Resolves: rhbz#2032691
- Rebuild against newer OpenLDAP version
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Nov 12 2021 Björn Esser <besser82@fedoraproject.org> - 0.56.7-3
- Rebuild(libnsl2)
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue May 18 2021 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.7-1
- CVE-2021-3480: invalid bind DN crash
- New upstream release
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Dec 04 2020 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.6-1
- New upstream release
- Ignore searches which don't match any configured map
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
 * Wed May 06 2020 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.5-2
 - Initialize map locks in NIS plugin to prevent crash

@ -128,13 +91,8 @@ make check
 - Resolves: rhbz#1751295: (2) When sync-repl is enabled, slapi-nis can deadlock during retrochanglog trimming
 - Resolves: rhbz#1768156: ERR - schemacompat - map rdlock: old way MAP_MONITOR_DISABLED

-* Fri Feb 07 2020 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.4-1
+* Tue Mar 10 2020 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.4-1
 - New upstream release
- Fix build with newer gcc versions
- Resolves rhbz#1800097
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (slapi-nis-0.60.0.tar.gz) = 15fe7f821c6b7eea5f93edb46adcc8ba8ac8369e47b607bd56db23bbaf3e0a3e35da412bcc3665aa35bfd01d3863222d926d661adb70491f3ecce1204bc4b6e7
-SHA512 (slapi-nis-0.60.0.tar.gz.asc) = 117c1da76320ec065970752cfb5de379dbe7899e08dbcb7f2699daa26cb8cb429e1436092e4d5b39c162fc3b3f58b3c48a24c6884c2bd909767bccdd27cf7786
+SHA512 (slapi-nis-0.56.5.tar.gz) = ed593603eaa1488dced2ca3a622b2230044ec605d0104f8d3085c3293d6bb3334528cdac2b1c70aa09cd84548d59a51082a3fc1ccfd0ac7f7ffcb8ccad40ab79
+SHA512 (slapi-nis-0.56.5.tar.gz.asc) = 335e0e64848c5b6721caf4fa3737f7068b47a9ade99d9aab413b6bbe2110f6c442c4794a48f2107fdbb2b47f5470d1876f4f23b10202428188a1464241229815
Author	SHA1	Message	Date
Alexander Bokovoy	e1e953db74	Initialize map lock in NIS plugin	2020-05-06 14:50:27 +03:00
Alexander Bokovoy	699243ed49	New upstream release (cherry picked from commit `461588afaf`)	2020-05-04 13:55:30 +03:00
Alexander Bokovoy	351035764e	0.56.4 release (cherry picked from commit `81bb8b97ed`)	2020-03-10 13:06:48 +02:00