+ Fixed slapd connectionless LDAP support

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index a4a0cf6898f95fd9b553d5b84c181db5cfb63e2a..b8feea972fcd5437ded0f77119167cf3e70eb036 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2005 The OpenLDAP Foundation.
+ * Copyright 1999-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,6 +29,7 @@
 #endif
 
 static struct berval supportedFeatures[] = {
+       BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT),         /* Modify/increment */
        BER_BVC(LDAP_FEATURE_ALL_OP_ATTRS),                     /* All Op Attrs (+) */
        BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS),        /* OCs in Attrs List (@class) */
        BER_BVC(LDAP_FEATURE_ABSOLUTE_FILTERS),         /* (&) and (|) search filters */
@@ -36,9 +37,6 @@ static struct berval supportedFeatures[] = {
        BER_BVC(LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS),/* Language Range Options */
 #ifdef LDAP_FEATURE_SUBORDINATE_SCOPE
        BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE),        /* "children" search scope */
-#endif
-#ifdef LDAP_FEATURE_MODIFY_INCREMENT
-       BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT),         /* Modify/increment */
 #endif
        {0,NULL}
 };
@@ -52,8 +50,10 @@ root_dse_info(
        const char **text )
 {
        Entry           *e;
-       struct berval val, *bv;
-       struct berval nval;
+       struct berval val;
+#ifdef LDAP_SLAPI
+       struct berval *bv;
+#endif
        int             i, j;
        char ** supportedSASLMechanisms;
        BackendDB *be;
@@ -64,8 +64,10 @@ root_dse_info(
                = slap_schema.si_ad_objectClass;
        AttributeDescription *ad_namingContexts
                = slap_schema.si_ad_namingContexts;
+#ifdef LDAP_SLAPI
        AttributeDescription *ad_supportedExtension
                = slap_schema.si_ad_supportedExtension;
+#endif
        AttributeDescription *ad_supportedLDAPVersion
                = slap_schema.si_ad_supportedLDAPVersion;
        AttributeDescription *ad_supportedSASLMechanisms
@@ -176,14 +178,13 @@ root_dse_info(
        }
 
        /* supportedLDAPVersion */
-       for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {
+               /* don't publish version 2 as we don't really support it
+                * (even when configured to accept version 2 Bind requests)
+                * and the value would never be used by true LDAPv2 (or LDAPv3)
+                * clients.
+                */
+       for ( i=LDAP_VERSION3; i<=LDAP_VERSION_MAX; i++ ) {
                char buf[BUFSIZ];
-               if (!( global_allows & SLAP_ALLOW_BIND_V2 ) &&
-                       ( i < LDAP_VERSION3 ) )
-               {
-                       /* version 2 and lower are disallowed */
-                       continue;
-               }
                snprintf(buf, sizeof buf, "%d", i);
                val.bv_val = buf;
                val.bv_len = strlen( val.bv_val );
@@ -235,11 +236,11 @@ root_dse_info(
  */
 int read_root_dse_file( const char *fname )
 {
-       FILE    *fp;
+       struct LDIFFP   *fp;
        int rc = 0, lineno = 0, lmax = 0;
        char    *buf = NULL;
 
-       if ( (fp = fopen( fname, "r" )) == NULL ) {
+       if ( (fp = ldif_open( fname, "r" )) == NULL ) {
                Debug( LDAP_DEBUG_ANY,
                        "could not open rootdse attr file \"%s\" - absolute path?\n",
                        fname, 0, 0 );
@@ -251,7 +252,7 @@ int read_root_dse_file( const char *fname )
        if( usr_attr == NULL ) {
                Debug( LDAP_DEBUG_ANY,
                        "read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );
-               fclose( fp );
+               ldif_close( fp );
                return LDAP_OTHER;
        }
        usr_attr->e_attrs = NULL;
@@ -303,8 +304,83 @@ int read_root_dse_file( const char *fname )
 
        ch_free( buf );
 
-       fclose( fp );
+       ldif_close( fp );
 
        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 ] = (char *) 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;
+}
+