Silence a warning about ldap_debug

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

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index 8a8f4327de6241e7d80a2642a1db2ac352d481af..b23e6adf32333070152e6cc4862cc70c67815bc5 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -45,6 +45,7 @@
 
 #include "slap.h"
 #include "back-ldap.h"
+#undef ldap_debug      /* silence a warning in ldap-int.h */
 #include "../../../libraries/libldap/ldap-int.h"
 
 static void ldap_send_entry( Backend *be, Operation *op, struct ldapconn *lc,
@@ -426,6 +427,7 @@ ldap_send_entry(
                attr = (Attribute *)ch_malloc( sizeof(Attribute) );
                if (attr == NULL)
                        continue;
+               attr->a_flags = 0;
                attr->a_next = 0;
                attr->a_desc = NULL;
                if (slap_bv2ad(&mapped, &attr->a_desc, &text) != LDAP_SUCCESS) {
@@ -547,7 +549,7 @@ ldap_send_entry(
                attr = ent.e_attrs;
                ent.e_attrs = attr->a_next;
                if (attr->a_vals != &dummy)
-                       bvarray_free(attr->a_vals);
+                       ber_bvarray_free(attr->a_vals);
                ch_free(attr);
        }