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 7286cd222a76d0e2c334e7f69f9cdc74ba1388f3..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;
@@ -121,74 +123,9 @@ ldap_back_db_init( Backend *be )
        be->be_private = li;
        SLAP_DBFLAGS( be ) |= SLAP_DBFLAG_NOLASTMOD;
 
-       return 0;
-}
-
-int
-ldap_back_discover_t_f_support( const char *uri, int version )
-{
-       LDAP            *ld;
-       LDAPMessage     *res = NULL, *entry;
-       int             rc, i;
-       struct berval   cred = BER_BVC( "" ),
-                       absoluteFilters = BER_BVC( LDAP_FEATURE_ABSOLUTE_FILTERS ),
-                       **values = NULL;
-       char            *attrs[ 2 ] = { "supportedFeatures", NULL };
-
-       rc = ldap_initialize( &ld, uri );
-       if ( rc != LDAP_SUCCESS ) {
-               return rc;
-       }
-
-       rc = ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version );
-       if ( rc != LDAP_SUCCESS ) {
-               goto done;
-       }
-
-       rc = ldap_sasl_bind_s( ld, "", LDAP_SASL_SIMPLE,
-                       &cred, NULL, NULL, NULL );
-       if ( rc != LDAP_SUCCESS ) {
-               goto done;
-       }
+       be->be_cf_ocs = be->bd_info->bi_cf_ocs;
 
-       rc = ldap_search_ext_s( ld, "", LDAP_SCOPE_BASE, "(objectClass=*)",
-                       attrs, 0, NULL, NULL, NULL, 0, &res );
-       if ( rc != LDAP_SUCCESS ) {
-               goto done;
-       }
-
-       entry = ldap_first_entry( ld, res );
-       if ( entry == NULL ) {
-               goto done;
-       }
-
-       values = ldap_get_values_len( ld, entry, attrs[ 0 ] );
-       if ( values == NULL ) {
-               rc = LDAP_NO_SUCH_ATTRIBUTE;
-               goto done;
-       }
-
-       for ( i = 0; values[ i ] != NULL; i++ ) {
-               if ( bvmatch( &absoluteFilters, values[ i ] ) ) {
-                       rc = LDAP_COMPARE_TRUE;
-                       goto done;
-               }
-       }
-
-       rc = LDAP_COMPARE_FALSE;
-
-done:;
-       if ( values != NULL ) {
-               ldap_value_free_len( values );
-       }
-
-       if ( res != NULL ) {
-               ldap_msgfree( res );
-       }
-
-       ldap_unbind_ext( ld, NULL, NULL );
-
-       return rc;
+       return 0;
 }
 
 int
@@ -250,7 +187,9 @@ ldap_back_db_open( BackendDB *be )
 
                li->flags &= ~LDAP_BACK_F_SUPPORT_T_F_DISCOVER;
 
-               rc = ldap_back_discover_t_f_support( li->url, li->version );
+               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;
                }