Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/slapi-nis.git#24638db0b5b2dfc787dc269f366d41fa7bd25232
This commit is contained in:
parent
3e3b202717
commit
14519e84de
|
@ -81,3 +81,5 @@ 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
|
||||
|
|
|
@ -1,49 +0,0 @@
|
|||
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,14 +10,13 @@
|
|||
%endif
|
||||
|
||||
Name: slapi-nis
|
||||
Version: 0.56.5
|
||||
Release: 3%{?dist}
|
||||
Version: 0.56.6
|
||||
Release: 1%{?dist}
|
||||
Summary: NIS Server and Schema Compatibility plugins for Directory Server
|
||||
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
|
||||
Patch1: slapi-nis-bz1832190.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: libtool
|
||||
|
@ -55,7 +54,6 @@ for attributes from multiple entries in the tree.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
autoconf --force
|
||||
|
@ -83,6 +81,10 @@ make check
|
|||
%{_sbindir}/nisserver-plugin-defs
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
||||
|
|
4
sources
4
sources
|
@ -1,2 +1,2 @@
|
|||
SHA512 (slapi-nis-0.56.5.tar.gz) = ed593603eaa1488dced2ca3a622b2230044ec605d0104f8d3085c3293d6bb3334528cdac2b1c70aa09cd84548d59a51082a3fc1ccfd0ac7f7ffcb8ccad40ab79
|
||||
SHA512 (slapi-nis-0.56.5.tar.gz.asc) = 335e0e64848c5b6721caf4fa3737f7068b47a9ade99d9aab413b6bbe2110f6c442c4794a48f2107fdbb2b47f5470d1876f4f23b10202428188a1464241229815
|
||||
SHA512 (slapi-nis-0.56.6.tar.gz) = d7fceefd94a635ac6c5e39ea2168da3582b79f698b8cd049515843af065581c5e7a732aeb6a5f796f12fdfe6c63b86ac3e1989dfb6f1eea91697db19569d84c5
|
||||
SHA512 (slapi-nis-0.56.6.tar.gz.asc) = df7eb7bd618130769594670f7cf28fd7b300d71b61a69c2265bdca9189dd69a7e98a7341179aaecd5e8be2a6318cbed19b9a8e2cc55354d7cec7dc8354c6d25a
|
||||
|
|
Loading…
Reference in New Issue