|
 |
8025fa |
From 61ea8f6a104da25329e301a8f56944f860de8177 Mon Sep 17 00:00:00 2001
|
|
|
8025fa |
From: Alexander Bokovoy <abokovoy@redhat.com>
|
|
|
8025fa |
Date: Sat, 12 Sep 2020 12:00:22 +0300
|
|
|
8025fa |
Subject: [PATCH] Ignore searches that do not match any of configured tree
|
|
|
8025fa |
|
|
|
8025fa |
Resolves: rhbz#1874015
|
|
|
8025fa |
Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
|
|
|
8025fa |
---
|
|
|
8025fa |
slapi-nis.spec | 5 ++++-
|
|
|
8025fa |
src/back-sch.c | 4 ++++
|
|
|
8025fa |
2 files changed, 8 insertions(+), 1 deletion(-)
|
|
|
8025fa |
|
|
|
8025fa |
diff --git a/slapi-nis.spec b/slapi-nis.spec
|
|
|
8025fa |
index 3eb3e37..8bde325 100644
|
|
|
8025fa |
--- a/slapi-nis.spec
|
|
|
8025fa |
+++ b/slapi-nis.spec
|
|
|
8025fa |
@@ -11,7 +11,7 @@
|
|
|
8025fa |
|
|
|
8025fa |
Name: slapi-nis
|
|
|
8025fa |
Version: 0.56.5
|
|
|
8025fa |
-Release: 1%{?dist}
|
|
|
8025fa |
+Release: 3%{?dist}
|
|
|
8025fa |
Summary: NIS Server and Schema Compatibility plugins for Directory Server
|
|
|
8025fa |
License: GPLv2
|
|
|
8025fa |
URL: http://pagure.io/slapi-nis/
|
|
|
8025fa |
@@ -81,6 +81,9 @@ make check
|
|
|
8025fa |
%{_sbindir}/nisserver-plugin-defs
|
|
|
8025fa |
|
|
|
8025fa |
%changelog
|
|
|
8025fa |
+* Sat Sep 12 2020 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.5-3
|
|
|
8025fa |
+- Ignore searches which don't match any configured map
|
|
|
8025fa |
+
|
|
|
8025fa |
* Mon May 04 2020 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.5-1
|
|
|
8025fa |
- New upstream release
|
|
|
8025fa |
- Resolves: rhbz#1751295: (2) When sync-repl is enabled, slapi-nis can deadlock during retrochanglog trimming
|
|
|
8025fa |
diff --git a/src/back-sch.c b/src/back-sch.c
|
|
|
8025fa |
index f8b04a3..a5e4c04 100644
|
|
|
8025fa |
--- a/src/back-sch.c
|
|
|
8025fa |
+++ b/src/back-sch.c
|
|
|
8025fa |
@@ -1790,6 +1790,10 @@ backend_search_cb(Slapi_PBlock *pb)
|
|
|
8025fa |
}
|
|
|
8025fa |
}
|
|
|
8025fa |
slapi_ch_free_string(&target);
|
|
|
8025fa |
+ if (cbdata.answer == FALSE) {
|
|
|
8025fa |
+ /* None of the configured trees in the sets matched the target at all, ignore search */
|
|
|
8025fa |
+ return 0;
|
|
|
8025fa |
+ }
|
|
|
8025fa |
}
|
|
|
8025fa |
cbdata.answer = FALSE;
|
|
|
8025fa |
#endif
|
|
|
8025fa |
--
|
|
|
8025fa |
2.26.2
|
|
|
8025fa |
|