--- servers/slapd/root_dse.c 2002/01/04 22:49:58 1.56 +++ servers/slapd/root_dse.c 2002/11/10 05:48:55 1.70 @@ -1,4 +1,4 @@ -/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.55 2002/01/04 20:17:47 kurt Exp $ */ +/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.69 2002/11/08 16:13:20 julius Exp $ */ /* root_dse.c - Provides the ROOT DSA-Specific Entry * * Copyright 1999-2002 The OpenLDAP Foundation. @@ -17,12 +17,15 @@ #include "slap.h" #include +#include "lber_pvt.h" -static char *supportedFeatures[] = { - "1.3.6.1.4.1.4203.1.5.1", /* all Operational Attributes ("+") */ - "1.3.6.1.4.1.4203.1.5.2", /* OCs in Attributes List */ - "1.3.6.1.4.1.4203.1.5.3", /* (&) and (|) search filters */ - NULL +static struct berval supportedFeatures[] = { + BER_BVC(LDAP_FEATURE_ALL_OPERATIONAL_ATTRS), /* all Operational Attributes ("+") */ + BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS), /* OCs in Attributes List */ + 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 */ + {0,NULL} }; static Entry *usr_attr = NULL; @@ -33,9 +36,8 @@ root_dse_info( Entry **entry, const char **text ) { - char buf[BUFSIZ]; Entry *e; - struct berval vals[2]; + struct berval vals[2], *bv; int i, j; char ** supportedSASLMechanisms; @@ -55,12 +57,25 @@ root_dse_info( = slap_schema.si_ad_supportedSASLMechanisms; AttributeDescription *ad_supportedFeatures = slap_schema.si_ad_supportedFeatures; + AttributeDescription *ad_monitorContext + = slap_schema.si_ad_monitorContext; AttributeDescription *ad_ref = slap_schema.si_ad_ref; vals[1].bv_val = NULL; - e = (Entry *) ch_calloc( 1, sizeof(Entry) ); + e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) ); + + if( e == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, + "root_dse_info: SLAP_CALLOC failed", 0, 0, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "root_dse_info: SLAP_CALLOC failed", 0, 0, 0 ); +#endif + return LDAP_OTHER; + } e->e_attrs = NULL; e->e_name.bv_val = ch_strdup( LDAP_ROOT_DSE ); @@ -74,61 +89,69 @@ root_dse_info( e->e_private = NULL; - vals[0].bv_val = "OpenLDAProotDSE"; - vals[0].bv_len = sizeof("OpenLDAProotDSE")-1; - attr_merge( e, ad_structuralObjectClass, vals ); - vals[0].bv_val = "top"; vals[0].bv_len = sizeof("top")-1; - attr_merge( e, ad_objectClass, vals ); + if( attr_merge( e, ad_objectClass, vals ) ) + return LDAP_OTHER; vals[0].bv_val = "OpenLDAProotDSE"; vals[0].bv_len = sizeof("OpenLDAProotDSE")-1; - attr_merge( e, ad_objectClass, vals ); + if( attr_merge( e, ad_objectClass, vals ) ) + return LDAP_OTHER; + if( attr_merge( e, ad_structuralObjectClass, vals ) ) + return LDAP_OTHER; for ( i = 0; i < nbackends; i++ ) { - if ( backends[i].be_glueflags & SLAP_GLUE_SUBORDINATE ) + if ( backends[i].be_flags & SLAP_BFLAG_MONITOR ) { + vals[0] = backends[i].be_suffix[0]; + if( attr_merge( e, ad_monitorContext, vals ) ) + return LDAP_OTHER; + continue; + } + if ( backends[i].be_flags & SLAP_BFLAG_GLUE_SUBORDINATE ) { continue; - for ( j = 0; backends[i].be_suffix[j] != NULL; j++ ) { - vals[0] = *backends[i].be_suffix[j]; - attr_merge( e, ad_namingContexts, vals ); + } + for ( j = 0; backends[i].be_suffix[j].bv_val != NULL; j++ ) { + vals[0] = backends[i].be_suffix[j]; + if( attr_merge( e, ad_namingContexts, vals ) ) + return LDAP_OTHER; } } /* altServer unsupported */ /* supportedControl */ - for ( i=0; supportedControls[i] != NULL; i++ ) { - vals[0].bv_val = supportedControls[i]; + for ( i=0; (vals[0].bv_val = get_supported_ctrl(i)) != NULL; i++ ) { vals[0].bv_len = strlen( vals[0].bv_val ); - attr_merge( e, ad_supportedControl, vals ); + if( attr_merge( e, ad_supportedControl, vals ) ) + return LDAP_OTHER; } /* supportedExtension */ - for ( i=0; (vals[0].bv_val = get_supported_extop(i)) != NULL; i++ ) { - vals[0].bv_len = strlen( vals[0].bv_val ); - attr_merge( e, ad_supportedExtension, vals ); + for ( i=0; (bv = get_supported_extop(i)) != NULL; i++ ) { + vals[0] = *bv; + if( attr_merge( e, ad_supportedExtension, vals ) ) + return LDAP_OTHER; } /* supportedFeatures */ - for ( i=0; supportedFeatures[i] != NULL; i++ ) { - vals[0].bv_val = supportedFeatures[i]; - vals[0].bv_len = strlen( vals[0].bv_val ); - attr_merge( e, ad_supportedFeatures, vals ); - } + if( attr_merge( e, ad_supportedFeatures, supportedFeatures ) ) + return LDAP_OTHER; /* supportedLDAPVersion */ for ( i=LDAP_VERSION_MIN; 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; } - sprintf(buf,"%d",i); + snprintf(buf, sizeof buf, "%d", i); vals[0].bv_val = buf; vals[0].bv_len = strlen( vals[0].bv_val ); - attr_merge( e, ad_supportedLDAPVersion, vals ); + if( attr_merge( e, ad_supportedLDAPVersion, vals ) ) + return LDAP_OTHER; } /* supportedSASLMechanism */ @@ -138,19 +161,22 @@ 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 ); - attr_merge( e, ad_supportedSASLMechanisms, vals ); + if( attr_merge( e, ad_supportedSASLMechanisms, vals ) ) + return LDAP_OTHER; } - charray_free( supportedSASLMechanisms ); + ldap_charray_free( supportedSASLMechanisms ); } if ( default_referral != NULL ) { - attr_merge( e, ad_ref, default_referral ); + if( attr_merge( e, ad_ref, default_referral ) ) + return LDAP_OTHER; } if( usr_attr != NULL) { Attribute *a; for( a = usr_attr->e_attrs; a != NULL; a = a->a_next ) { - attr_merge( e, a->a_desc, a->a_vals ); + if( attr_merge( e, a->a_desc, a->a_vals ) ) + return LDAP_OTHER; } } @@ -178,7 +204,17 @@ int read_root_dse_file( const char *fnam return EXIT_FAILURE; } - usr_attr = (Entry *) ch_calloc( 1, sizeof(Entry) ); + usr_attr = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) ); + if( usr_attr == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, + "read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 ); +#endif + return LDAP_OTHER; + } usr_attr->e_attrs = NULL; while( ldif_read_record( fp, &lineno, &buf, &lmax ) ) { @@ -188,7 +224,6 @@ int read_root_dse_file( const char *fnam if( e == NULL ) { fprintf( stderr, "root_dse: could not parse entry (line=%d)\n", lineno ); - entry_free( e ); entry_free( usr_attr ); usr_attr = NULL; return EXIT_FAILURE; @@ -212,7 +247,8 @@ int read_root_dse_file( const char *fnam */ for(a = e->e_attrs; a != NULL; a = a->a_next) { - attr_merge( usr_attr, a->a_desc, a->a_vals ); + if( attr_merge( usr_attr, a->a_desc, a->a_vals ) ) + return LDAP_OTHER; } entry_free( e );