--- servers/slapd/root_dse.c 2001/12/19 21:41:00 1.47 +++ servers/slapd/root_dse.c 2002/04/08 16:37:38 1.62 @@ -1,7 +1,7 @@ -/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.46 2001/12/10 11:09:41 hyc Exp $ */ +/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.61 2002/02/15 15:33:44 hyc Exp $ */ /* 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 @@ -17,11 +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 */ - NULL +static struct berval supportedFeatures[] = { + 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} }; static Entry *usr_attr = NULL; @@ -34,8 +38,7 @@ root_dse_info( { char buf[BUFSIZ]; Entry *e; - struct berval val; - struct berval *vals[2]; + struct berval vals[2], *bv; int i, j; char ** supportedSASLMechanisms; @@ -58,37 +61,40 @@ root_dse_info( AttributeDescription *ad_ref = slap_schema.si_ad_ref; - Attribute *a; - - vals[0] = &val; - vals[1] = NULL; + 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 = "OpenLDAProotDSE"; - val.bv_len = sizeof("OpenLDAProotDSE")-1; + vals[0].bv_val = "OpenLDAProotDSE"; + vals[0].bv_len = sizeof("OpenLDAProotDSE")-1; attr_merge( e, ad_structuralObjectClass, vals ); - 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 ); for ( i = 0; i < nbackends; i++ ) { - if ( backends[i].be_glueflags & SLAP_GLUE_SUBORDINATE ) + if ( backends[i].be_flags & SLAP_BFLAG_GLUE_SUBORDINATE ) { continue; + } 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 ); + vals[0] = *backends[i].be_suffix[j]; attr_merge( e, ad_namingContexts, vals ); } } @@ -96,36 +102,31 @@ 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 ) && + 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 ); + vals[0].bv_val = buf; + vals[0].bv_len = strlen( vals[0].bv_val ); attr_merge( e, ad_supportedLDAPVersion, vals ); } @@ -134,8 +135,8 @@ 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 ); } charray_free( supportedSASLMechanisms ); @@ -146,7 +147,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 ); } } @@ -167,8 +169,6 @@ int read_root_dse_file( const char *fnam 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", @@ -182,6 +182,7 @@ int read_root_dse_file( const char *fnam while( ldif_read_record( fp, &lineno, &buf, &lmax ) ) { Entry *e = str2entry( buf ); + Attribute *a; if( e == NULL ) { fprintf( stderr, "root_dse: could not parse entry (line=%d)\n", @@ -192,17 +193,8 @@ int read_root_dse_file( const char *fnam 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 ); @@ -227,6 +219,6 @@ int read_root_dse_file( const char *fnam 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; }