Changes from HEAD for beta

[openldap] / servers / slapd / back-meta / cache-query.c

diff --git a/servers/slapd/back-meta/cache-query.c b/servers/slapd/back-meta/cache-query.c
index 58e986dbe232604fe1c2d5ed996881e69aa7bafb..1571ec380f0108c977f3c64dd46183615900b878 100644 (file)
--- a/servers/slapd/back-meta/cache-query.c
+++ b/servers/slapd/back-meta/cache-query.c
@@ -26,7 +26,6 @@
 #include "../back-ldap/back-ldap.h"
 #include "back-meta.h"
 
-#ifdef LDAP_CACHING 
 static void    add_query_on_top (query_manager*, CachedQuery*);
 static int     base_scope_compare(struct berval* dn_stored, 
                                   struct berval* dn_incoming, int scope_stored,
@@ -117,6 +116,7 @@ query_containment(query_manager* qm,
                                                }
                                        } 
                                        switch (fs->f_choice) {
+                                       case LDAP_FILTER_OR: 
                                        case LDAP_FILTER_AND:
                                                fs = fs->f_and;
                                                fi = fi->f_and;
@@ -161,6 +161,9 @@ query_containment(query_manager* qm,
                                                fs=fs->f_next;
                                                fi=fi->f_next;  
                                                break;
+                                       case LDAP_FILTER_NOT:
+                                               res=0;
+                                               break;
                                        default:
                                                break;
                                        } 
@@ -461,4 +464,3 @@ remove_from_template (CachedQuery* qc, QueryTemplate* template)
 
        template->no_of_queries--;  
 }    
-#endif