fix previous commit

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index 3ee82956df15a42ee545a399c0faf8eabdc1dba8..37aae39db13ae09aae3cb00ab067e1674f045ed5 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -118,11 +118,22 @@ ldap_back_search(
 
        /* deal with <draft-zeilenga-ldap-t-f> filters */
        filter = op->ors_filterstr.bv_val;
-       if ( li->flags & LDAP_BACK_F_SUPPORT_T_F ) {
-               if ( bvmatch( &op->ors_filterstr, &bv_true ) ) {
+       if ( bvmatch( &op->ors_filterstr, &bv_true ) ) {
+               if ( li->flags & LDAP_BACK_F_SUPPORT_T_F ) {
                        filter = "(&)";
-               } else if ( bvmatch( &op->ors_filterstr, &bv_false ) ) {
+
+               } else {
+                       /* better than nothing... */
+                       filter = "(objectClass=*)";
+               }
+
+       } else if ( bvmatch( &op->ors_filterstr, &bv_false ) ) {
+               if ( li->flags & LDAP_BACK_F_SUPPORT_T_F ) {
                        filter = "(|)";
+
+               } else {
+                       /* better than nothing... */
+                       filter = "(!(objectClass=*))";
                }
        }