X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Froot_dse.c;h=854bb0e2ec9e7652288cae77f13244da46c4c083;hb=956f1d16aa522da6f6506d9c8fe9ce0d9867678a;hp=19c6291015b20a8209cbe24e53da6168dc7d5d09;hpb=fcd1ce0e28b4dbffe0bc4cf277a82fd9daded883;p=openldap diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c index 19c6291015..854bb0e2ec 100644 --- a/servers/slapd/root_dse.c +++ b/servers/slapd/root_dse.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* root_dse.c - Provides the ROOT DSA-Specific Entry * - * Copyright 1999-2000 The OpenLDAP Foundation. + * Copyright 1999-2002 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms are permitted only @@ -16,10 +16,16 @@ #include #include "slap.h" - -static char *supportedFeatures[] = { - "1.3.6.1.4.1.4203.1.5.1", /* All Operational Attributes ("+") */ - NULL +#include +#include "lber_pvt.h" + +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; @@ -30,47 +36,68 @@ root_dse_info( Entry **entry, const char **text ) { - char buf[BUFSIZ]; Entry *e; - struct berval val; - struct berval *vals[2]; + struct berval vals[2], *bv; int i, j; char ** supportedSASLMechanisms; - AttributeDescription *ad_objectClass = 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 = slap_schema.si_ad_supportedLDAPVersion; - AttributeDescription *ad_supportedSASLMechanisms = slap_schema.si_ad_supportedSASLMechanisms; - AttributeDescription *ad_supportedFeatures = slap_schema.si_ad_supportedFeatures; - AttributeDescription *ad_ref = slap_schema.si_ad_ref; - - Attribute *a; - - vals[0] = &val; - vals[1] = NULL; + AttributeDescription *ad_structuralObjectClass + = slap_schema.si_ad_structuralObjectClass; + AttributeDescription *ad_objectClass + = 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 + = slap_schema.si_ad_supportedLDAPVersion; + AttributeDescription *ad_supportedSASLMechanisms + = 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->e_attrs = NULL; - e->e_dn = ch_strdup( LDAP_ROOT_DSE ); - e->e_ndn = ch_strdup( LDAP_ROOT_DSE ); - (void) dn_normalize( e->e_ndn ); + e->e_name.bv_val = ch_strdup( LDAP_ROOT_DSE ); + e->e_name.bv_len = sizeof( LDAP_ROOT_DSE )-1; + e->e_nname.bv_val = ch_strdup( LDAP_ROOT_DSE ); + e->e_nname.bv_len = sizeof( LDAP_ROOT_DSE )-1; + + /* the DN is an empty string so no pretty/normalization is needed */ + assert( !e->e_name.bv_len ); + assert( !e->e_nname.bv_len ); + e->e_private = NULL; - val.bv_val = "top"; - val.bv_len = sizeof("top")-1; + vals[0].bv_val = "top"; + vals[0].bv_len = sizeof("top")-1; attr_merge( e, ad_objectClass, vals ); - val.bv_val = "OpenLDAProotDSE"; - val.bv_len = sizeof("OpenLDAProotDSE")-1; + vals[0].bv_val = "OpenLDAProotDSE"; + vals[0].bv_len = sizeof("OpenLDAProotDSE")-1; attr_merge( e, ad_objectClass, vals ); + attr_merge( e, ad_structuralObjectClass, vals ); for ( i = 0; i < nbackends; i++ ) { - for ( j = 0; backends[i].be_suffix[j] != NULL; j++ ) { - val.bv_val = backends[i].be_suffix[j]; - val.bv_len = strlen( val.bv_val ); + if ( backends[i].be_flags & SLAP_BFLAG_MONITOR ) { + vals[0] = backends[i].be_suffix[0]; + attr_merge( e, ad_monitorContext, vals ); + continue; + } + 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]; attr_merge( e, ad_namingContexts, vals ); } } @@ -78,36 +105,32 @@ root_dse_info( /* altServer unsupported */ /* supportedControl */ - for ( i=0; supportedControls[i] != NULL; i++ ) { - val.bv_val = supportedControls[i]; - val.bv_len = strlen( val.bv_val ); + 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 ); } /* supportedExtension */ - for ( i=0; (val.bv_val = get_supported_extop(i)) != NULL; i++ ) { - val.bv_len = strlen( val.bv_val ); + for ( i=0; (bv = get_supported_extop(i)) != NULL; i++ ) { + vals[0] = *bv; attr_merge( e, ad_supportedExtension, vals ); } /* supportedFeatures */ - for ( i=0; supportedFeatures[i] != NULL; i++ ) { - val.bv_val = supportedFeatures[i]; - val.bv_len = strlen( val.bv_val ); - attr_merge( e, ad_supportedFeatures, vals ); - } + attr_merge( e, ad_supportedFeatures, supportedFeatures ); /* supportedLDAPVersion */ for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) { - if (( global_disallows & SLAP_DISALLOW_BIND_V2 ) && + char buf[BUFSIZ]; + if (!( global_allows & SLAP_ALLOW_BIND_V2 ) && ( i < LDAP_VERSION3 ) ) { /* version 2 and lower are disallowed */ continue; } - sprintf(buf,"%d",i); - val.bv_val = buf; - val.bv_len = strlen( val.bv_val ); + 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 ); } @@ -116,10 +139,11 @@ root_dse_info( if( supportedSASLMechanisms != NULL ) { for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) { - val.bv_val = supportedSASLMechanisms[i]; - val.bv_len = strlen( val.bv_val ); + vals[0].bv_val = supportedSASLMechanisms[i]; + vals[0].bv_len = strlen( vals[0].bv_val ); attr_merge( e, ad_supportedSASLMechanisms, vals ); } + ldap_charray_free( supportedSASLMechanisms ); } if ( default_referral != NULL ) { @@ -127,7 +151,8 @@ root_dse_info( } if( usr_attr != NULL) { - for(a = usr_attr->e_attrs; a != NULL; a = a->a_next) { + Attribute *a; + for( a = usr_attr->e_attrs; a != NULL; a = a->a_next ) { attr_merge( e, a->a_desc, a->a_vals ); } } @@ -145,12 +170,9 @@ root_dse_info( int read_root_dse_file( const char *fname ) { FILE *fp; - char *line, *savefname, *saveline; int rc = 0, lineno = 0, lmax = 0; char *buf = NULL; - Attribute *a; - if ( (fp = fopen( fname, "r" )) == NULL ) { Debug( LDAP_DEBUG_ANY, "could not open rootdse attr file \"%s\" - absolute path?\n", @@ -163,8 +185,8 @@ int read_root_dse_file( const char *fname ) usr_attr->e_attrs = NULL; while( ldif_read_record( fp, &lineno, &buf, &lmax ) ) { - ID id; Entry *e = str2entry( buf ); + Attribute *a; if( e == NULL ) { fprintf( stderr, "root_dse: could not parse entry (line=%d)\n", @@ -175,17 +197,8 @@ int read_root_dse_file( const char *fname ) return EXIT_FAILURE; } - if( dn_normalize( e->e_ndn ) == NULL ) { - fprintf( stderr, "root_dse: invalid dn=\"%s\" (line=%d)\n", - e->e_dn, lineno ); - entry_free( e ); - entry_free( usr_attr ); - usr_attr = NULL; - return EXIT_FAILURE; - } - - /* make sure the DN is a valid rootdse(rootdse is a null string) */ - if( strcmp(e->e_ndn, "") != 0 ) { + /* 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 ); @@ -210,6 +223,6 @@ int read_root_dse_file( const char *fname ) ch_free( buf ); - 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; }