From 84a40529d3b55075acb6b517be2f9311a03206e2 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 15 Apr 2010 22:01:38 +0000
Subject: [PATCH] ITS#6481
---
CHANGES | 1 +
servers/slapd/acl.c | 11 ++++++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/CHANGES b/CHANGES
index 5ed9a8f2e3..0dd855d164 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ OpenLDAP 2.4.22 Engineering
Added slapd tools selective iterations (ITS#6442)
Added slapo-pbind
Fixed libldap GnuTLS serial length (ITS#6460)
+ Fixed slapd acl non-entry internal searches (ITS#6481)
Fixed slapd certificateListValidate (ITS#6466)
Fixed slapd empty URI parsing (ITS#6465)
Fixed slapd ignore controls with unrecognized flags (ITS#6480)
diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index d076ad0b62..a1d52492b6 100644
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -2132,7 +2132,16 @@ acl_set_cb_gather( Operation *op, SlapReply *rs )
}
} else {
- assert( rs->sr_type == REP_RESULT );
+ switch ( rs->sr_type ) {
+ case REP_SEARCHREF:
+ case REP_INTERMEDIATE:
+ /* ignore */
+ break;
+
+ default:
+ assert( rs->sr_type == REP_RESULT );
+ break;
+ }
}
return 0;
--
GitLab