rpms
/
slapi-nis
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Handle base searches within the compat tree 

Related: rhbz#2183950

Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Alexander Bokovoy 2023-04-24 16:13:20 +03:00
parent 1bb45004a2
commit b2b8e05f03
2 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
slapi-nis-bz2183950.patch
View File

@ -1,7 +1,7 @@
From 24eeccd408d9627299231d7843ca9e65e71af3de Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Tue, 21 Mar 2023 17:32:47 +0200
Subject: [PATCH] Test the case when container is a child of the target DN
Subject: [PATCH 1/2] Test the case when container is a child of the target DN
We can have target DN both inside or outside of a container.
Previously, the code did not look into the latter one. When container is
@ -42,5 +42,37 @@ index 93746b1..e447bda 100644
}
--
2.39.2
2.40.0
From 73058645eac86b40913deec01807854e0a8bda0d Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Mon, 24 Apr 2023 12:19:10 +0300
Subject: [PATCH 2/2] Identify the container without search base check
Ignore the actual search base when identifying whether a target DN is
within a known data container. The reason is that we need to know
whether a search would have to descent into a particular container. The
scope validation will happen later.
Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
---
src/back-sch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/back-sch.c b/src/back-sch.c
index e447bda..a79f61b 100644
--- a/src/back-sch.c
+++ b/src/back-sch.c
@@ -1340,7 +1340,7 @@ backend_search_find_set_dn_in_group_cb(const char *group, const char *set, bool_
if (slapi_sdn_scope_test(cbdata->target_dn,
set_data->container_sdn,
- cbdata->scope) != 0) {
+ LDAP_SCOPE_SUBTREE) != 0) {
cbdata->answer = TRUE;
} else if ((cbdata->scope == LDAP_SCOPE_SUBTREE) &&
slapi_sdn_scope_test(set_data->container_sdn,
--
2.40.0

6
slapi-nis.spec
View File

@ -11,7 +11,7 @@
Name: slapi-nis
Version: 0.60.0
Release: 3%{?dist}
Release: 4%{?dist}
Summary: NIS Server and Schema Compatibility plugins for Directory Server
License: GPLv3
URL: http://pagure.io/slapi-nis/
@ -85,6 +85,10 @@ make check
%{_sbindir}/nisserver-plugin-defs
%changelog
* Mon Apr 24 2023 Alexander Bokovoy <abokovoy@redhat.com> - 0.60.0-4
- Also handle base searches within the compat tree
- Related: rhbz#2183950
* Wed Apr 12 2023 Alexander Bokovoy <abokovoy@redhat.com> - 0.60.0-3
- Fix base DN searches outside the compat tree
- Resolves: rhbz#2183950