--- servers/slapd/root_dse.c 2003/03/05 23:48:33 1.61.2.9 +++ servers/slapd/root_dse.c 2002/06/19 04:06:21 1.64 @@ -1,7 +1,7 @@ -/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.61.2.8 2003/02/10 19:22:47 kurt Exp $ */ +/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.63 2002/05/01 16:50:14 hyc Exp $ */ /* root_dse.c - Provides the ROOT DSA-Specific Entry * - * Copyright 1999-2003 The OpenLDAP Foundation. + * Copyright 1999-2002 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms are permitted only @@ -13,23 +13,18 @@ #include "portable.h" #include - #include #include "slap.h" #include #include "lber_pvt.h" -#ifdef LDAP_SLAPI -#include "slapi.h" -#endif - 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 */ + BER_BVC("1.3.6.1.4.1.4203.1.5.1"), /* all Operational Attributes ("+") */ + BER_BVC("1.3.6.1.4.1.4203.1.5.2"), /* OCs in Attributes List */ + BER_BVC("1.3.6.1.4.1.4203.1.5.3"), /* (&) and (|) search filters */ + BER_BVC("1.3.6.1.4.1.4203.1.5.4"), /* Language Tag Options */ + BER_BVC("1.3.6.1.4.1.4203.1.5.5"), /* Language Range Options */ {0,NULL} }; @@ -41,6 +36,7 @@ root_dse_info( Entry **entry, const char **text ) { + char buf[BUFSIZ]; Entry *e; struct berval vals[2], *bv; int i, j; @@ -62,25 +58,12 @@ 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 *) 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 = (Entry *) ch_calloc( 1, sizeof(Entry) ); e->e_attrs = NULL; e->e_name.bv_val = ch_strdup( LDAP_ROOT_DSE ); @@ -94,32 +77,28 @@ 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; - if( attr_merge( e, ad_objectClass, vals ) ) - return LDAP_OTHER; + attr_merge( e, ad_objectClass, vals ); vals[0].bv_val = "OpenLDAProotDSE"; vals[0].bv_len = sizeof("OpenLDAProotDSE")-1; - if( attr_merge( e, ad_objectClass, vals ) ) - return LDAP_OTHER; - if( attr_merge( e, ad_structuralObjectClass, vals ) ) - return LDAP_OTHER; + attr_merge( e, ad_objectClass, vals ); for ( i = 0; i < nbackends; i++ ) { 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 ( SLAP_GLUE_SUBORDINATE( &backends[i] ) ) { + if ( backends[i].be_flags & SLAP_BFLAG_GLUE_SUBORDINATE ) { continue; } 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; + attr_merge( e, ad_namingContexts, vals ); } } @@ -128,43 +107,30 @@ root_dse_info( /* 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; + attr_merge( e, ad_supportedControl, vals ); } /* supportedExtension */ for ( i=0; (bv = get_supported_extop(i)) != NULL; i++ ) { vals[0] = *bv; - if( attr_merge( e, ad_supportedExtension, vals ) ) - return LDAP_OTHER; - } - -#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 ); } -#endif /* LDAP_SLAPI */ /* supportedFeatures */ - if( attr_merge( e, ad_supportedFeatures, supportedFeatures ) ) - return LDAP_OTHER; + attr_merge( e, ad_supportedFeatures, supportedFeatures ); /* 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; } - snprintf(buf, sizeof buf, "%d", i); + sprintf(buf,"%d",i); vals[0].bv_val = buf; vals[0].bv_len = strlen( vals[0].bv_val ); - if( attr_merge( e, ad_supportedLDAPVersion, vals ) ) - return LDAP_OTHER; + attr_merge( e, ad_supportedLDAPVersion, vals ); } /* supportedSASLMechanism */ @@ -174,22 +140,19 @@ 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 ); - if( attr_merge( e, ad_supportedSASLMechanisms, vals ) ) - return LDAP_OTHER; + attr_merge( e, ad_supportedSASLMechanisms, vals ); } - ldap_charray_free( supportedSASLMechanisms ); + charray_free( supportedSASLMechanisms ); } if ( default_referral != NULL ) { - if( attr_merge( e, ad_ref, default_referral ) ) - return LDAP_OTHER; + attr_merge( e, ad_ref, default_referral ); } if( usr_attr != NULL) { Attribute *a; for( a = usr_attr->e_attrs; a != NULL; a = a->a_next ) { - if( attr_merge( e, a->a_desc, a->a_vals ) ) - return LDAP_OTHER; + attr_merge( e, a->a_desc, a->a_vals ); } } @@ -217,17 +180,7 @@ int read_root_dse_file( const char *fnam return EXIT_FAILURE; } - 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 = (Entry *) ch_calloc( 1, sizeof(Entry) ); usr_attr->e_attrs = NULL; while( ldif_read_record( fp, &lineno, &buf, &lmax ) ) { @@ -237,6 +190,7 @@ 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; @@ -260,8 +214,7 @@ int read_root_dse_file( const char *fnam */ for(a = e->e_attrs; a != NULL; a = a->a_next) { - if( attr_merge( usr_attr, a->a_desc, a->a_vals ) ) - return LDAP_OTHER; + attr_merge( usr_attr, a->a_desc, a->a_vals ); } entry_free( e );