X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Froot_dse.c;h=68166471f8a8fc26d2893eae0dd673708b9b575b;hb=b1688462ce7c376097221f72e18bfbaaa4070181;hp=919830f6dee18fb7a3b2270d58adfd5254a068ee;hpb=403f4479bc9f9a864122d4aeecf7284408918302;p=openldap diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c index 919830f6de..68166471f8 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 The OpenLDAP Foundation. + * Copyright 1999-2000 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms are permitted only @@ -13,19 +13,40 @@ #include "portable.h" #include - #include #include "slap.h" -void -root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly ) +static char *supportedFeatures[] = { + "1.3.6.1.4.1.4203.1.5.1", /* All Operational Attributes ("+") */ + NULL +}; + +static Entry *usr_attr = NULL; + +int +root_dse_info( + Connection *conn, + Entry **entry, + const char **text ) { char buf[BUFSIZ]; Entry *e; struct berval val; struct berval *vals[2]; 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; @@ -35,90 +56,161 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly ) e->e_attrs = NULL; e->e_dn = ch_strdup( LDAP_ROOT_DSE ); e->e_ndn = ch_strdup( LDAP_ROOT_DSE ); - (void) dn_normalize_case( e->e_ndn ); + (void) dn_normalize( e->e_ndn ); e->e_private = NULL; + val.bv_val = "top"; + val.bv_len = sizeof("top")-1; + attr_merge( e, ad_objectClass, vals ); + + val.bv_val = "OpenLDAProotDSE"; + val.bv_len = sizeof("OpenLDAProotDSE")-1; + attr_merge( e, ad_objectClass, 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 ); - attr_merge( e, "namingContexts", vals ); + attr_merge( e, ad_namingContexts, vals ); } } -#if defined( SLAPD_MONITOR_DN ) - val.bv_val = SLAPD_MONITOR_DN; - val.bv_len = strlen( val.bv_val ); - attr_merge( e, "namingContexts", vals ); - /* subschemasubentry is added by send_search_entry() */ -#endif - -#if defined( SLAPD_CONFIG_DN ) - val.bv_val = SLAPD_CONFIG_DN; - val.bv_len = strlen( val.bv_val ); - attr_merge( e, "namingContexts", vals ); -#endif - -#if defined( SLAPD_SCHEMA_DN ) - val.bv_val = SLAPD_SCHEMA_DN; - val.bv_len = strlen( val.bv_val ); - attr_merge( e, "namingContexts", vals ); -#endif - /* altServer unsupported */ /* supportedControl */ for ( i=0; supportedControls[i] != NULL; i++ ) { val.bv_val = supportedControls[i]; val.bv_len = strlen( val.bv_val ); - attr_merge( e, "supportedControl", vals ); + attr_merge( e, ad_supportedControl, vals ); } /* supportedExtension */ - for ( i=0; supportedExtensions[i] != NULL; i++ ) { - val.bv_val = supportedExtensions[i]; + for ( i=0; (val.bv_val = get_supported_extop(i)) != NULL; i++ ) { val.bv_len = strlen( val.bv_val ); - attr_merge( e, "supportedExtension", vals ); + 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 ); } /* supportedLDAPVersion */ for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) { + if (( global_disallows & SLAP_DISALLOW_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 ); - attr_merge( e, "supportedLDAPVersion", vals ); + attr_merge( e, ad_supportedLDAPVersion, vals ); } /* supportedSASLMechanism */ + supportedSASLMechanisms = slap_sasl_mechs( conn ); + if( supportedSASLMechanisms != NULL ) { for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) { val.bv_val = supportedSASLMechanisms[i]; val.bv_len = strlen( val.bv_val ); - attr_merge( e, "supportedSASLMechanisms", vals ); + attr_merge( e, ad_supportedSASLMechanisms, vals ); } + charray_free( supportedSASLMechanisms ); } if ( default_referral != NULL ) { - attr_merge( e, "ref", default_referral ); + attr_merge( e, ad_ref, default_referral ); } - val.bv_val = "top"; - val.bv_len = sizeof("top")-1; - attr_merge( e, "objectClass", vals ); + if( usr_attr != NULL) { + for(a = usr_attr->e_attrs; a != NULL; a = a->a_next) { + attr_merge( e, a->a_desc, a->a_vals ); + } + } - val.bv_val = "LDAPsubentry"; - val.bv_len = sizeof("LDAPsubentry")-1; - attr_merge( e, "objectClass", vals ); + *entry = e; + return LDAP_SUCCESS; +} - val.bv_val = "extensibleObject"; - val.bv_len = sizeof("extensibleObject")-1; - attr_merge( e, "objectClass", vals ); +/* + * Read the entries specified in fname and merge the attributes + * to the user defined rootDSE. Note thaat if we find any errors + * what so ever, we will discard the entire entries, print an + * error message and return. + */ +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", + fname, 0, 0 ); + perror( fname ); + return EXIT_FAILURE; + } - send_search_entry( &backends[0], conn, op, - e, attrs, attrsonly, NULL ); - send_search_result( conn, op, LDAP_SUCCESS, - NULL, NULL, NULL, NULL, 1 ); + usr_attr = (Entry *) ch_calloc( 1, sizeof(Entry) ); + usr_attr->e_attrs = NULL; - entry_free( e ); -} + while( ldif_read_record( fp, &lineno, &buf, &lmax ) ) { + ID id; + Entry *e = str2entry( buf ); + + 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; + } + + 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 ) { + fprintf( stderr, + "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; + } + + /* + * we found a valid entry, so walk thru all the attributes in the + * entry, and add each attribute type and description to the + * usr_attr entry + */ + + for(a = e->e_attrs; a != NULL; a = a->a_next) { + attr_merge( usr_attr, a->a_desc, a->a_vals ); + } + + entry_free( e ); + } + + ch_free( buf ); + + Debug(LDAP_DEBUG_CONFIG,"rootDSE file %s read.\n", fname, 0, 0); + return rc; +}