fix subtree shortcut (ITS#4856)

diff --git a/doc/man/man5/slapd-sql.5 b/doc/man/man5/slapd-sql.5
index 454f63f46d4b0e88a682ef5ade9aa462e41a35e5..7f12908892d7f17ecb5d41463d7e8e27d084c4b6 100644 (file)
--- 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 b9d9365034b735526651ffff4ebd15cb70c633e1..0e574139330a35a225e93fe7a359bc5c9271a884 100644 (file)
--- 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;