Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
e1e953db74 | ||
|
699243ed49 | ||
|
351035764e |
5
.gitignore
vendored
5
.gitignore
vendored
@ -76,3 +76,8 @@ slapi-nis-0.17.tar.gz
|
|||||||
/slapi-nis-0.56.2.tar.gz.sig
|
/slapi-nis-0.56.2.tar.gz.sig
|
||||||
/slapi-nis-0.56.3.tar.gz
|
/slapi-nis-0.56.3.tar.gz
|
||||||
/slapi-nis-0.56.3.tar.gz.sig
|
/slapi-nis-0.56.3.tar.gz.sig
|
||||||
|
/slapi-nis-0.56.4.tar.gz
|
||||||
|
/slapi-nis-0.56.4.tar.gz.asc
|
||||||
|
/slapi-nis-0.56.4.tar.gz.sig
|
||||||
|
/slapi-nis-0.56.5.tar.gz
|
||||||
|
/slapi-nis-0.56.5.tar.gz.asc
|
||||||
|
49
slapi-nis-bz1832190.patch
Normal file
49
slapi-nis-bz1832190.patch
Normal file
@ -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
|
||||||
|
|
@ -10,13 +10,14 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: slapi-nis
|
Name: slapi-nis
|
||||||
Version: 0.56.3
|
Version: 0.56.5
|
||||||
Release: 2%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: NIS Server and Schema Compatibility plugins for Directory Server
|
Summary: NIS Server and Schema Compatibility plugins for Directory Server
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: http://pagure.io/slapi-nis/
|
URL: http://pagure.io/slapi-nis/
|
||||||
Source0: https://releases.pagure.org/slapi-nis/slapi-nis-%{version}.tar.gz
|
Source0: https://releases.pagure.org/slapi-nis/slapi-nis-%{version}.tar.gz
|
||||||
Source1: https://releases.pagure.org/slapi-nis/slapi-nis-%{version}.tar.gz.sig
|
Source1: https://releases.pagure.org/slapi-nis/slapi-nis-%{version}.tar.gz.asc
|
||||||
|
Patch1: slapi-nis-bz1832190.patch
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
@ -31,7 +32,7 @@ BuildRequires: libsss_nss_idmap-devel > 1.16.0-5
|
|||||||
BuildRequires: pam-devel
|
BuildRequires: pam-devel
|
||||||
%if (0%{?fedora} > 14 && 0%{?fedora} < 28) || (0%{?rhel} > 6 && 0%{?rhel} < 8)
|
%if (0%{?fedora} > 14 && 0%{?fedora} < 28) || (0%{?rhel} > 6 && 0%{?rhel} < 8)
|
||||||
BuildRequires: libtirpc-devel
|
BuildRequires: libtirpc-devel
|
||||||
%else:
|
%else
|
||||||
BuildRequires: libnsl2-devel
|
BuildRequires: libnsl2-devel
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?fedora} > 27
|
%if 0%{?fedora} > 27
|
||||||
@ -54,6 +55,7 @@ for attributes from multiple entries in the tree.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoconf --force
|
autoconf --force
|
||||||
@ -81,6 +83,17 @@ make check
|
|||||||
%{_sbindir}/nisserver-plugin-defs
|
%{_sbindir}/nisserver-plugin-defs
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 06 2020 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.5-2
|
||||||
|
- Initialize map locks in NIS plugin to prevent crash
|
||||||
|
|
||||||
|
* Mon May 04 2020 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.5-1
|
||||||
|
- New upstream release
|
||||||
|
- 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
|
||||||
|
|
||||||
|
* Tue Mar 10 2020 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.4-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.3-2
|
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.3-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
4
sources
4
sources
@ -1,2 +1,2 @@
|
|||||||
SHA512 (slapi-nis-0.56.3.tar.gz) = 9346a90f188bd2d25c1fb403a0a4e5d0cde16af013d2ab6270f66b810ee4c96deb182c62a434ae7ba138c2c5341d1b828fa1db4abbdfa1c287947d02ec4a2378
|
SHA512 (slapi-nis-0.56.5.tar.gz) = ed593603eaa1488dced2ca3a622b2230044ec605d0104f8d3085c3293d6bb3334528cdac2b1c70aa09cd84548d59a51082a3fc1ccfd0ac7f7ffcb8ccad40ab79
|
||||||
SHA512 (slapi-nis-0.56.3.tar.gz.sig) = 21eed105a6948c54a862d2ed293bda8ca7b3b3a181240e0ffe387b5732f5da95c0752ec7fbd224aa20381340b413f5c305eea690d55bb24739d5aade5a820df7
|
SHA512 (slapi-nis-0.56.5.tar.gz.asc) = 335e0e64848c5b6721caf4fa3737f7068b47a9ade99d9aab413b6bbe2110f6c442c4794a48f2107fdbb2b47f5470d1876f4f23b10202428188a1464241229815
|
||||||
|
Loading…
Reference in New Issue
Block a user