backout this for now

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

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index aa76717800666c798d3e575ec96239a01f77349a..3beaec8d57f53ff4927794653b66f08d081d10ee 100644 (file)
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -87,11 +87,10 @@ ldap_back_initialize(
        bi->bi_op_delete = ldap_back_delete;
        bi->bi_op_abandon = 0;
 
-       bi->bi_extended = 0;
+       bi->bi_extended = ldap_back_extended;
 
-       bi->bi_acl_group = ldap_back_group;
-       bi->bi_acl_attribute = ldap_back_attribute;
        bi->bi_chk_referrals = 0;
+       bi->bi_entry_get_rw = ldap_back_entry_get;
 
        bi->bi_connection_init = 0;
        bi->bi_connection_destroy = ldap_back_conn_destroy;
@@ -112,6 +111,11 @@ ldap_back_db_init(
                return -1;
        }
 
+       li->binddn.bv_val = NULL;
+       li->binddn.bv_len = 0;
+       li->bindpw.bv_val = NULL;
+       li->bindpw.bv_len = 0;
+
 #ifdef ENABLE_REWRITE
        li->rwinfo = rewrite_info_init( REWRITE_MODE_USE_DEFAULT );
        if ( li->rwinfo == NULL ) {
@@ -175,13 +179,13 @@ ldap_back_db_destroy(
                        ch_free(li->url);
                        li->url = NULL;
                }
-               if (li->binddn) {
-                       ch_free(li->binddn);
-                       li->binddn = NULL;
+               if (li->binddn.bv_val) {
+                       ch_free(li->binddn.bv_val);
+                       li->binddn.bv_val = NULL;
                }
-               if (li->bindpw) {
-                       ch_free(li->bindpw);
-                       li->bindpw = NULL;
+               if (li->bindpw.bv_val) {
+                       ch_free(li->bindpw.bv_val);
+                       li->bindpw.bv_val = NULL;
                }
                 if (li->conntree) {
                        avl_free( li->conntree, ldap_back_conn_free );