X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Froot_dse.c;h=90a7193467000c2842476fe11abb1bd7c5aa0f20;hb=e3b1020e7558dff26d8c87ebb2746f197775c24f;hp=f968a6252bd65e4e9180384785b486e0c5334ceb;hpb=6939c531700652491f4be4688c6a1f35a1ab8a18;p=openldap diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c index f968a6252b..90a7193467 100644 --- a/servers/slapd/root_dse.c +++ b/servers/slapd/root_dse.c @@ -11,18 +11,18 @@ */ #include "portable.h" -#include "slapi_common.h" #include + #include #include "slap.h" -#include "slapi.h" #include #include "lber_pvt.h" -#include "slapi/slapi_utils.h" -struct berval *ns_get_supported_extop (int); +#ifdef LDAP_SLAPI +#include "slapi.h" +#endif static struct berval supportedFeatures[] = { BER_BVC(LDAP_FEATURE_ALL_OPERATIONAL_ATTRS), /* all Operational Attributes ("+") */ @@ -42,7 +42,10 @@ root_dse_info( const char **text ) { Entry *e; - struct berval vals[2], *bv; + struct berval vals[2], *bv; +#ifdef SLAP_NVALUES + struct berval nvals[2]; +#endif int i, j; char ** supportedSASLMechanisms; @@ -52,8 +55,6 @@ root_dse_info( = slap_schema.si_ad_objectClass; AttributeDescription *ad_namingContexts = slap_schema.si_ad_namingContexts; - AttributeDescription *ad_supportedControl - = slap_schema.si_ad_supportedControl; AttributeDescription *ad_supportedExtension = slap_schema.si_ad_supportedExtension; AttributeDescription *ad_supportedLDAPVersion @@ -68,6 +69,9 @@ root_dse_info( = slap_schema.si_ad_ref; vals[1].bv_val = NULL; +#ifdef SLAP_NVALUES + nvals[1].bv_val = NULL; +#endif e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) ); @@ -96,60 +100,104 @@ root_dse_info( vals[0].bv_val = "top"; vals[0].bv_len = sizeof("top")-1; +#ifdef SLAP_NVALUES + if( attr_merge( e, ad_objectClass, vals, vals ) ) +#else if( attr_merge( e, ad_objectClass, vals ) ) +#endif + { return LDAP_OTHER; + } vals[0].bv_val = "OpenLDAProotDSE"; vals[0].bv_len = sizeof("OpenLDAProotDSE")-1; +#ifdef SLAP_NVALUES + if( attr_merge( e, ad_objectClass, vals, vals ) ) +#else if( attr_merge( e, ad_objectClass, vals ) ) +#endif return LDAP_OTHER; +#ifdef SLAP_NVALUES + if( attr_merge( e, ad_structuralObjectClass, vals, vals ) ) +#else if( attr_merge( e, ad_structuralObjectClass, vals ) ) +#endif return LDAP_OTHER; for ( i = 0; i < nbackends; i++ ) { if ( backends[i].be_flags & SLAP_BFLAG_MONITOR ) { vals[0] = backends[i].be_suffix[0]; +#ifdef SLAP_NVALUES + if( attr_merge( e, ad_monitorContext, vals, nvals ) ) +#else if( attr_merge( e, ad_monitorContext, vals ) ) +#endif + { return LDAP_OTHER; + } continue; } - if ( backends[i].be_flags & SLAP_BFLAG_GLUE_SUBORDINATE ) { + if ( SLAP_GLUE_SUBORDINATE( &backends[i] ) ) { continue; } for ( j = 0; backends[i].be_suffix[j].bv_val != NULL; j++ ) { vals[0] = backends[i].be_suffix[j]; +#ifdef SLAP_NVALUES + if( attr_merge( e, ad_namingContexts, vals, NULL ) ) +#else if( attr_merge( e, ad_namingContexts, vals ) ) +#endif + { return LDAP_OTHER; + } } } /* altServer unsupported */ /* supportedControl */ - for ( i=0; (vals[0].bv_val = get_supported_ctrl(i)) != NULL; i++ ) { - vals[0].bv_len = strlen( vals[0].bv_val ); - if( attr_merge( e, ad_supportedControl, vals ) ) - return LDAP_OTHER; + if ( controls_root_dse_info( e ) != 0 ) { + return LDAP_OTHER; } /* supportedExtension */ for ( i=0; (bv = get_supported_extop(i)) != NULL; i++ ) { vals[0] = *bv; +#ifdef SLAP_NVALUES + if( attr_merge( e, ad_supportedExtension, vals, NULL ) ) +#else if( attr_merge( e, ad_supportedExtension, vals ) ) +#endif + { return LDAP_OTHER; + } } -#if defined( LDAP_SLAPI ) +#ifdef LDAP_SLAPI /* netscape supportedExtension */ for ( i = 0; (bv = ns_get_supported_extop(i)) != NULL; i++ ) { vals[0] = *bv; - attr_merge( e, ad_supportedExtension, vals ); +#ifdef SLAP_NVALUES + if( attr_merge( e, ad_supportedExtension, vals, NULL )) +#else + if( attr_merge( e, ad_supportedExtension, vals )) +#endif + { + return LDAP_OTHER; + } } -#endif /* defined( LDAP_SLAPI ) */ +#endif /* LDAP_SLAPI */ /* supportedFeatures */ +#ifdef SLAP_NVALUES + if( attr_merge( e, ad_supportedFeatures, + supportedFeatures, supportedFeatures ) ) +#else if( attr_merge( e, ad_supportedFeatures, supportedFeatures ) ) +#endif + { return LDAP_OTHER; + } /* supportedLDAPVersion */ for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) { @@ -163,8 +211,14 @@ root_dse_info( snprintf(buf, sizeof buf, "%d", i); vals[0].bv_val = buf; vals[0].bv_len = strlen( vals[0].bv_val ); +#ifdef SLAP_NVALUES + if( attr_merge( e, ad_supportedLDAPVersion, vals, NULL ) ) +#else if( attr_merge( e, ad_supportedLDAPVersion, vals ) ) +#endif + { return LDAP_OTHER; + } } /* supportedSASLMechanism */ @@ -174,22 +228,40 @@ root_dse_info( for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) { vals[0].bv_val = supportedSASLMechanisms[i]; vals[0].bv_len = strlen( vals[0].bv_val ); +#ifdef SLAP_NVALUES + if( attr_merge( e, ad_supportedSASLMechanisms, vals, NULL ) ) +#else if( attr_merge( e, ad_supportedSASLMechanisms, vals ) ) +#endif + { return LDAP_OTHER; + } } ldap_charray_free( supportedSASLMechanisms ); } if ( default_referral != NULL ) { +#ifdef SLAP_NVALUES + if( attr_merge( e, ad_ref, default_referral, NULL /* FIXME */ ) ) +#else if( attr_merge( e, ad_ref, default_referral ) ) +#endif + { return LDAP_OTHER; + } } if( usr_attr != NULL) { Attribute *a; for( a = usr_attr->e_attrs; a != NULL; a = a->a_next ) { +#ifdef SLAP_NVALUES + if( attr_merge( e, a->a_desc, a->a_vals, a->a_nvals ) ) +#else if( attr_merge( e, a->a_desc, a->a_vals ) ) +#endif + { return LDAP_OTHER; + } } } @@ -226,6 +298,7 @@ int read_root_dse_file( const char *fname ) Debug( LDAP_DEBUG_ANY, "read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 ); #endif + fclose( fp ); return LDAP_OTHER; } usr_attr->e_attrs = NULL; @@ -237,9 +310,8 @@ int read_root_dse_file( const char *fname ) if( e == NULL ) { fprintf( stderr, "root_dse: could not parse entry (line=%d)\n", lineno ); - entry_free( usr_attr ); - usr_attr = NULL; - return EXIT_FAILURE; + rc = EXIT_FAILURE; + break; } /* make sure the DN is the empty DN */ @@ -248,9 +320,8 @@ int read_root_dse_file( const char *fname ) "root_dse: invalid rootDSE - dn=\"%s\" (line=%d)\n", e->e_dn, lineno ); entry_free( e ); - entry_free( usr_attr ); - usr_attr = NULL; - return EXIT_FAILURE; + rc = EXIT_FAILURE; + break; } /* @@ -260,15 +331,30 @@ int read_root_dse_file( const char *fname ) */ for(a = e->e_attrs; a != NULL; a = a->a_next) { +#ifdef SLAP_NVALUES + if( attr_merge( usr_attr, a->a_desc, a->a_vals, a->a_nvals ) ) +#else if( attr_merge( usr_attr, a->a_desc, a->a_vals ) ) - return LDAP_OTHER; +#endif + { + rc = LDAP_OTHER; + break; + } } entry_free( e ); + if (rc) break; + } + + if (rc) { + entry_free( usr_attr ); + usr_attr = NULL; } ch_free( buf ); + fclose( fp ); + Debug(LDAP_DEBUG_CONFIG, "rootDSE file %s read.\n", fname, 0, 0); return rc; }