move discover function to frontend

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index 7286cd222a76d0e2c334e7f69f9cdc74ba1388f3..02c9ad0b114a5053f72b7aeb90a0b5d490403c79 100644 (file)
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -124,73 +124,6 @@ ldap_back_db_init( Backend *be )
        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;
-       }
-
-       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;
-}
-
 int
 ldap_back_db_open( BackendDB *be )
 {
@@ -250,7 +183,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;
                }

diff --git a/servers/slapd/back-meta/init.c b/servers/slapd/back-meta/init.c
index 6628be9fd937cc846d8f40e835ed3ce3b684eaeb..305bf901b94c32667b6b83a156d039792c5fe7e8 100644 (file)
--- a/servers/slapd/back-meta/init.c
+++ b/servers/slapd/back-meta/init.c
@@ -110,8 +110,10 @@ meta_back_db_open(
        for ( i = 0; i < mi->mi_ntargets; i++ ) {
                if ( mi->mi_targets[ i ].mt_flags & LDAP_BACK_F_SUPPORT_T_F_DISCOVER ) {
                        mi->mi_targets[ i ].mt_flags &= ~LDAP_BACK_F_SUPPORT_T_F_DISCOVER;
-                       rc = ldap_back_discover_t_f_support( mi->mi_targets[ i ].mt_uri,
-                                       mi->mi_targets[ i ].mt_version );
+                       rc = slap_discover_feature( mi->mi_targets[ i ].mt_uri,
+                                       mi->mi_targets[ i ].mt_version,
+                                       slap_schema.si_ad_supportedFeatures->ad_cname.bv_val,
+                                       LDAP_FEATURE_ABSOLUTE_FILTERS );
                        if ( rc == LDAP_COMPARE_TRUE ) {
                                mi->mi_targets[ i ].mt_flags |= LDAP_BACK_F_SUPPORT_T_F;
                        }

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 9dff1bda140e224a3eb1536b8adb17f417046a7e..b9d28e54150fee24b301644eedcf3790b5eaed32 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -1185,6 +1185,12 @@ LDAP_SLAPD_F (int) root_dse_info LDAP_P((
 LDAP_SLAPD_F (int) read_root_dse_file LDAP_P((
        const char *file));
 
+LDAP_SLAPD_F (int) slap_discover_feature LDAP_P((
+       const char      *uri,
+       int             version,
+       const char      *attr,
+       const char      *val ));
+
 /*
  * sasl.c
  */

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index a4a0cf6898f95fd9b553d5b84c181db5cfb63e2a..f4ee3bb47707db76b34a79691a4152c13938df4a 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -308,3 +308,78 @@ int read_root_dse_file( const char *fname )
        Debug(LDAP_DEBUG_CONFIG, "rootDSE file %s read.\n", fname, 0, 0);
        return rc;
 }
+
+int
+slap_discover_feature(
+       const char      *uri,
+       int             version,
+       const char      *attr,
+       const char      *val )
+{
+       LDAP            *ld;
+       LDAPMessage     *res = NULL, *entry;
+       int             rc, i;
+       struct berval   cred = BER_BVC( "" ),
+                       bv_val,
+                       **values = NULL;
+       char            *attrs[ 2 ] = { NULL, NULL };
+
+       ber_str2bv( val, 0, 0, &bv_val );
+       attrs[ 0 ] = attr;
+
+       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;
+       }
+
+       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( &bv_val, 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;
+}
+