Partial revert of f30269f5d2e4bb5ee7486fe6542078d1b59dba6d

[openldap] / servers / slapd / filterentry.c

diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index 68bcca86bf52f6d96afe5d22363848ece76f326c..d369586fc0a1b88a70d0470cfbc82f2153067a95 100644 (file)
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2008 The OpenLDAP Foundation.
+ * Copyright 1998-2012 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -169,7 +169,7 @@ static int test_mra_filter(
 
        if ( op == NULL ) {
                memctx = NULL;
-               memfree = slap_sl_free;
+               memfree = slap_sl_mfuncs.bmf_free;
        } else {
                memctx = op->o_tmpmemctx;
                memfree = op->o_tmpfree;
@@ -546,7 +546,7 @@ test_ava_filter(
        if ( ava->aa_desc == slap_schema.si_ad_hasSubordinates 
                && op && op->o_bd && op->o_bd->be_has_subordinates )
        {
-               int     hasSubordinates;
+               int     hasSubordinates = 0;
                struct berval hs;
 
                if( type != LDAP_FILTER_EQUALITY &&