fix -ULDAP_DEVEL compile

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

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index 328e3ceaa8ecb1506205e4dd0d5df7ff77bcb19f..1b8fb45139bdf32d11f8f53cbcdc4e3fc39ee48c 100644 (file)
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -47,7 +47,7 @@ ldap_back_initialize( BackendInfo *bi )
        bi->bi_destroy = 0;
 
        bi->bi_db_init = ldap_back_db_init;
-       bi->bi_db_config = ldap_back_db_config;
+       bi->bi_db_config = config_generic_wrapper;
        bi->bi_db_open = ldap_back_db_open;
        bi->bi_db_close = 0;
        bi->bi_db_destroy = ldap_back_db_destroy;
@@ -70,11 +70,11 @@ ldap_back_initialize( BackendInfo *bi )
        bi->bi_connection_init = 0;
        bi->bi_connection_destroy = ldap_back_conn_destroy;
 
-       if ( chain_init( ) ) {
+       if ( chain_init() ) {
                return -1;
        }
 
-       return 0;
+       return ldap_back_init_cf( bi );
 }
 
 int
@@ -91,8 +91,9 @@ ldap_back_db_init( Backend *be )
        BER_BVZERO( &li->acl_authcDN );
        BER_BVZERO( &li->acl_passwd );
 
-       li->acl_authmethod = LDAP_AUTH_SIMPLE;
+       li->acl_authmethod = LDAP_AUTH_NONE;
        BER_BVZERO( &li->acl_sasl_mech );
+       li->acl_sb.sb_tls = SB_TLS_DEFAULT;
 
        li->idassert_mode = LDAP_BACK_IDASSERT_LEGACY;
 
@@ -102,8 +103,9 @@ ldap_back_db_init( Backend *be )
 
        BER_BVZERO( &li->idassert_authzID );
 
-       li->idassert_authmethod = LDAP_AUTH_SIMPLE;
+       li->idassert_authmethod = LDAP_AUTH_NONE;
        BER_BVZERO( &li->idassert_sasl_mech );
+       li->idassert_sb.sb_tls = SB_TLS_DEFAULT;
 
        /* by default, use proxyAuthz control on each operation */
        li->idassert_flags = LDAP_BACK_AUTH_NONE;
@@ -113,11 +115,16 @@ ldap_back_db_init( Backend *be )
        /* initialize flags */
        li->flags = LDAP_BACK_F_CHASE_REFERRALS;
 
+       /* initialize version */
+       li->version = LDAP_VERSION3;
+
        ldap_pvt_thread_mutex_init( &li->conn_mutex );
 
        be->be_private = li;
        SLAP_DBFLAGS( be ) |= SLAP_DBFLAG_NOLASTMOD;
 
+       be->be_cf_ocs = be->bd_info->bi_cf_ocs;
+
        return 0;
 }
 
@@ -175,6 +182,19 @@ ldap_back_db_open( BackendDB *be )
        }
 #endif /* SLAPD_MONITOR */
 
+       if ( li->flags & LDAP_BACK_F_SUPPORT_T_F_DISCOVER ) {
+               int             rc;
+
+               li->flags &= ~LDAP_BACK_F_SUPPORT_T_F_DISCOVER;
+
+               rc = slap_discover_feature( li->url, li->version,
+                               slap_schema.si_ad_supportedFeatures->ad_cname.bv_val,
+                               LDAP_FEATURE_ABSOLUTE_FILTERS );
+               if ( rc == LDAP_COMPARE_TRUE ) {
+                       li->flags |= LDAP_BACK_F_SUPPORT_T_F;
+               }
+       }
+
        return 0;
 }