From 648a81c96e791ab9957ad0d556578176fea6e01a Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Mon, 5 Mar 2007 19:39:51 +0000 Subject: [PATCH] fix subtree shortcut (ITS#4856) --- CHANGES | 1 + doc/man/man5/slapd-sql.5 | 2 +- servers/slapd/back-sql/search.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index b90a548580..2e371e26b6 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,7 @@ OpenLDAP 2.3.35 Engineering Fixed str2anlist handling of undefined attrs/OCs (ITS#4854) Fixed slapd-bdb/hdb startup with missing shm env (ITS#4851) Fixed slapd-meta/slapo-rwm filter mapping + Fixed slapd-sql subtree shortcut (ITS#4856) Fixed slapo-refint config message (ITS#4853) Fixed libldap_r tpool reset (ITS#4855) diff --git a/doc/man/man5/slapd-sql.5 b/doc/man/man5/slapd-sql.5 index 7048ce96f3..86554094b8 100644 --- a/doc/man/man5/slapd-sql.5 +++ b/doc/man/man5/slapd-sql.5 @@ -100,7 +100,7 @@ see \fBupper_func\fP, \fBupper_needs_cast\fP, \fBconcat_pattern\fP and \fBstrcast_func\fP in "HELPER CONFIGURATION" for details. .TP -.B use_subtree_shortcut { NO | yes } +.B use_subtree_shortcut { YES | no } Do not use the subtree condition when the searchBase is the database suffix, and the scope is subtree; rather collect all entries. diff --git a/servers/slapd/back-sql/search.c b/servers/slapd/back-sql/search.c index 1c32f85178..1acfbe87a1 100644 --- a/servers/slapd/back-sql/search.c +++ b/servers/slapd/back-sql/search.c @@ -2183,7 +2183,6 @@ backsql_search( Operation *op, SlapReply *rs ) case LDAP_SCOPE_SUBTREE: /* FIXME: this should never fail... */ if ( !dnIsSuffix( &eid->eid_ndn, &op->o_req_ndn ) ) { - assert( 0 ); goto next_entry2; } break; -- 2.39.5