handle undefined filters in back-ldap (more about ITS#6814)

[openldap] / servers / slapd / back-ldap / search.c

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index ccba7fb68a1d808fe688a65d9a964995bb53c921..a4a9aa4d8553df7bb8e197c4a7549dc0c3944cad 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -309,8 +309,32 @@ retry:
                        goto finish;
 
                case LDAP_FILTER_ERROR:
-                       if (ldap_back_munge_filter( op, &filter, &freefilter ) > 0 ) {
-                               goto retry;
+                       /* first try? */
+                       if ( filter.bv_val == op->ors_filterstr.bv_val ) {
+                               if ( strstr( filter.bv_val, "(?" ) ) {
+                                       int do_retry = 0;
+                                       if ( !LDAP_BACK_NOUNDEFFILTER( li ) ) {
+                                               BER_BVZERO( &filter );
+                                               filter2bv_undef_x( op, op->ors_filter, 1, &filter );
+                                               freefilter++;
+                                               do_retry++;
+                                       }
+
+                                       /* if anything survives, try replacing t-f */
+                                       if ( strstr( filter.bv_val, "(?" ) ) {
+                                               int dmy = 0;
+                                               if ( ldap_back_munge_filter( op, &filter, &dmy ) > 0 ) {
+                                                       do_retry++;
+                                               }
+                                               if ( dmy ) {
+                                                       freefilter++;
+                                               }
+                                       }
+
+                                       if ( do_retry ) {
+                                               goto retry;
+                                       }
+                               }
                        }
 
                        /* invalid filters return success with no data */