X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Froot_dse.c;h=877414f80789e7aab65ca8aaf2ad6b83fa87de56;hb=a720011c8a05d610c737c4e7e299b03506ce810f;hp=c3b30ac63b0a726a20ef6582da3923bd45a0a1ab;hpb=acbb5cf689a4336af05c9f259d909d8141055bac;p=openldap diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c index c3b30ac63b..877414f807 100644 --- a/servers/slapd/root_dse.c +++ b/servers/slapd/root_dse.c @@ -35,7 +35,7 @@ static struct berval builtin_supportedFeatures[] = { BER_BVC(LDAP_FEATURE_ABSOLUTE_FILTERS), /* (&) and (|) search filters */ BER_BVC(LDAP_FEATURE_LANGUAGE_TAG_OPTIONS), /* Language Tag Options */ BER_BVC(LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS), /* Language Range Options */ -#ifdef LDAP_FEATURE_SUBORDINATE_SCOPE +#ifdef LDAP_DEVEL BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE), /* "children" search scope */ #endif BER_BVNULL @@ -213,11 +213,10 @@ root_dse_info( AttributeDescription *ad_ref = slap_schema.si_ad_ref; - e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) ); - + e = entry_alloc(); if( e == NULL ) { Debug( LDAP_DEBUG_ANY, - "root_dse_info: SLAP_CALLOC failed", 0, 0, 0 ); + "root_dse_info: entry_alloc failed", 0, 0, 0 ); return LDAP_OTHER; } @@ -236,15 +235,17 @@ root_dse_info( /* FIXME: is this really needed? */ BER_BVSTR( &val, "top" ); if( attr_merge_one( e, ad_objectClass, &val, NULL ) ) { +fail: + entry_free( e ); return LDAP_OTHER; } BER_BVSTR( &val, "OpenLDAProotDSE" ); if( attr_merge_one( e, ad_objectClass, &val, NULL ) ) { - return LDAP_OTHER; + goto fail; } if( attr_merge_one( e, ad_structuralObjectClass, &val, NULL ) ) { - return LDAP_OTHER; + goto fail; } LDAP_STAILQ_FOREACH( be, &backendDB, be_next ) { @@ -258,7 +259,7 @@ root_dse_info( &be->be_suffix[0], &be->be_nsuffix[0] ) ) { - return LDAP_OTHER; + goto fail; } continue; } @@ -267,7 +268,7 @@ root_dse_info( &be->be_suffix[0], & be->be_nsuffix[0] ) ) { - return LDAP_OTHER; + goto fail; } continue; } @@ -279,7 +280,7 @@ root_dse_info( &be->be_suffix[j], &be->be_nsuffix[0] ) ) { - return LDAP_OTHER; + goto fail; } } } @@ -288,19 +289,19 @@ root_dse_info( /* supportedControl */ if ( controls_root_dse_info( e ) != 0 ) { - return LDAP_OTHER; + goto fail; } /* supportedExtension */ if ( exop_root_dse_info( e ) != 0 ) { - return LDAP_OTHER; + goto fail; } #ifdef LDAP_SLAPI /* netscape supportedExtension */ for ( i = 0; (bv = slapi_int_get_supported_extop(i)) != NULL; i++ ) { if( attr_merge_one( e, ad_supportedExtension, bv, NULL ) ) { - return LDAP_OTHER; + goto fail; } } #endif /* LDAP_SLAPI */ @@ -311,7 +312,7 @@ root_dse_info( } if( attr_merge( e, ad_supportedFeatures, supportedFeatures, NULL ) ) { - return LDAP_OTHER; + goto fail; } /* supportedLDAPVersion */ @@ -321,12 +322,12 @@ root_dse_info( * clients. */ for ( i=LDAP_VERSION3; i<=LDAP_VERSION_MAX; i++ ) { - char buf[BUFSIZ]; + char buf[sizeof("255")]; snprintf(buf, sizeof buf, "%d", i); val.bv_val = buf; val.bv_len = strlen( val.bv_val ); if( attr_merge_one( e, ad_supportedLDAPVersion, &val, NULL ) ) { - return LDAP_OTHER; + goto fail; } } @@ -338,7 +339,8 @@ root_dse_info( val.bv_val = supportedSASLMechanisms[i]; val.bv_len = strlen( val.bv_val ); if( attr_merge_one( e, ad_supportedSASLMechanisms, &val, NULL ) ) { - return LDAP_OTHER; + ldap_charray_free( supportedSASLMechanisms ); + goto fail; } } ldap_charray_free( supportedSASLMechanisms ); @@ -346,7 +348,7 @@ root_dse_info( if ( default_referral != NULL ) { if( attr_merge( e, ad_ref, default_referral, NULL /* FIXME */ ) ) { - return LDAP_OTHER; + goto fail; } } @@ -356,7 +358,7 @@ root_dse_info( if( attr_merge( e, a->a_desc, a->a_vals, (a->a_nvals == a->a_vals) ? NULL : a->a_nvals ) ) { - return LDAP_OTHER; + goto fail; } } } @@ -373,13 +375,31 @@ root_dse_info( return LDAP_SUCCESS; } +int +root_dse_init( void ) +{ + return 0; +} + +int +root_dse_destroy( void ) +{ + if ( usr_attr ) { + entry_free( usr_attr ); + usr_attr = NULL; + } + + return 0; +} + /* * Read the entries specified in fname and merge the attributes * to the user defined rootDSE. Note thaat if we find any errors * what so ever, we will discard the entire entries, print an * error message and return. */ -int read_root_dse_file( const char *fname ) +int +root_dse_read_file( const char *fname ) { struct LDIFFP *fp; int rc = 0, lineno = 0, lmax = 0; @@ -387,16 +407,16 @@ int read_root_dse_file( const char *fname ) if ( (fp = ldif_open( fname, "r" )) == NULL ) { Debug( LDAP_DEBUG_ANY, - "could not open rootdse attr file \"%s\" - absolute path?\n", + "root_dse_read_file: could not open rootdse attr file \"%s\" - absolute path?\n", fname, 0, 0 ); perror( fname ); return EXIT_FAILURE; } - usr_attr = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) ); + usr_attr = entry_alloc(); if( usr_attr == NULL ) { Debug( LDAP_DEBUG_ANY, - "read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 ); + "root_dse_read_file: entry_alloc failed", 0, 0, 0 ); ldif_close( fp ); return LDAP_OTHER; } @@ -407,17 +427,19 @@ int read_root_dse_file( const char *fname ) Attribute *a; if( e == NULL ) { - fprintf( stderr, "root_dse: could not parse entry (line=%d)\n", - lineno ); + Debug( LDAP_DEBUG_ANY, "root_dse_read_file: " + "could not parse entry (file=\"%s\" line=%d)\n", + fname, lineno, 0 ); rc = EXIT_FAILURE; break; } /* make sure the DN is the empty DN */ if( e->e_nname.bv_len ) { - fprintf( stderr, - "root_dse: invalid rootDSE - dn=\"%s\" (line=%d)\n", - e->e_dn, lineno ); + Debug( LDAP_DEBUG_ANY, + "root_dse_read_file: invalid rootDSE " + "- dn=\"%s\" (file=\"%s\" line=%d)\n", + e->e_dn, fname, lineno ); entry_free( e ); rc = EXIT_FAILURE; break; @@ -451,44 +473,29 @@ int read_root_dse_file( const char *fname ) ldif_close( fp ); - Debug(LDAP_DEBUG_CONFIG, "rootDSE file %s read.\n", fname, 0, 0); + Debug(LDAP_DEBUG_CONFIG, "rootDSE file=\"%s\" read.\n", fname, 0, 0); return rc; } int slap_discover_feature( - const char *uri, - int version, + slap_bindconf *sb, const char *attr, const char *val ) { - LDAP *ld; + LDAP *ld = NULL; LDAPMessage *res = NULL, *entry; int rc, i; - struct berval cred = BER_BVC( "" ), - bv_val, + struct berval 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 ); + rc = slap_client_connect( &ld, sb ); if ( rc != LDAP_SUCCESS ) { goto done; } + attrs[ 0 ] = (char *) attr; rc = ldap_search_ext_s( ld, "", LDAP_SCOPE_BASE, "(objectClass=*)", attrs, 0, NULL, NULL, NULL, 0, &res ); if ( rc != LDAP_SUCCESS ) { @@ -506,6 +513,7 @@ slap_discover_feature( goto done; } + ber_str2bv( val, 0, 0, &bv_val ); for ( i = 0; values[ i ] != NULL; i++ ) { if ( bvmatch( &bv_val, values[ i ] ) ) { rc = LDAP_COMPARE_TRUE;