fix subtree shortcut (ITS#4856)

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)
 

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.
 

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;