partial fix to ITS#3659; still problems in merging values with "permissive" set

[openldap] / servers / slapd / overlays / pcache.c

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index e75b79c741303162ac1854f4ad36ab342cf91fba..88268f141e02002b0da37f9d313015270e11ed88 100644 (file)
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -789,7 +789,11 @@ remove_query_data (
 {
        struct query_info       *qi, *qnext;
        char                    filter_str[64];
-       AttributeAssertion      ava;
+#ifdef LDAP_COMP_MATCH
+       AttributeAssertion      ava = { NULL, BER_BVNULL, NULL };
+#else
+       AttributeAssertion      ava = { NULL, BER_BVNULL };
+#endif
        Filter                  filter = {LDAP_FILTER_EQUALITY};
        SlapReply               sreply = {REP_RESULT};
        slap_callback cb = { NULL, remove_func, NULL, NULL };
@@ -1654,9 +1658,6 @@ proxy_cache_config(
        }
        /* anything else */
        else {
-               if ( argv0 != argv[0] ) {
-                       return SLAP_CONF_UNKNOWN;
-               }
                rc = cm->db.bd_info->bi_db_config( &cm->db, fname, lineno, argc, argv );
        }