fix subtree shortcut (ITS#4856)

diff --git a/CHANGES b/CHANGES
index b90a54858080e66079becdfd1b1da66da2799d37..2e371e26b691eb5df8bc0c94b29dbfa315bd716c 100644 (file)
--- 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 7048ce96f3a6d4f8b535b96b124ca61cba857aa7..86554094b8aae7c3793a27d4088c505a5f797869 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 1c32f85178e276344963042c0c2496e076a2f6fc..1acfbe87a1f36c25c7c709b2e64ee3f70e74527f 100644 (file)
--- 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;