From d07f85fc9179ff0f3d480d8500e6676c006136c2 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Mon, 5 Mar 2007 19:39:32 +0000 Subject: [PATCH] fix subtree shortcut (ITS#4856) --- doc/man/man5/slapd-sql.5 | 2 +- servers/slapd/back-sql/search.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/man/man5/slapd-sql.5 b/doc/man/man5/slapd-sql.5 index 454f63f46d..7f12908892 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 b9d9365034..0e57413933 100644 --- a/servers/slapd/back-sql/search.c +++ b/servers/slapd/back-sql/search.c @@ -2179,7 +2179,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