servers/slapd/root_dse.c - diff

Return to root_dse.c CVS log

Up to [OpenLDAP] / servers / slapd

Diff for /servers/slapd/root_dse.c between versions 1.69 and 1.81.2.2

version 1.69, 2002/11/08 16:13:20	version 1.81.2.2, 2003/09/18 15:43:35
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.68 2002/11/01 17:59:53 julius Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.81.2.1 2003/05/31 19:01:40 kurt Exp $ */
/* root_dse.c - Provides the ROOT DSA-Specific Entry	/* root_dse.c - Provides the ROOT DSA-Specific Entry
*	*
* Copyright 1999-2002 The OpenLDAP Foundation.	* Copyright 1999-2003 The OpenLDAP Foundation.
* All rights reserved.	* All rights reserved.
*	*
* Redistribution and use in source and binary forms are permitted only	* Redistribution and use in source and binary forms are permitted only
Line 13	Line 13
#include "portable.h"	#include "portable.h"

#include <stdio.h>	#include <stdio.h>

#include <ac/string.h>	#include <ac/string.h>

#include "slap.h"	#include "slap.h"
#include <ldif.h>	#include <ldif.h>
#include "lber_pvt.h"	#include "lber_pvt.h"

	#ifdef LDAP_SLAPI
	#include "slapi.h"
	#endif

static struct berval supportedFeatures[] = {	static struct berval supportedFeatures[] = {
BER_BVC(LDAP_FEATURE_ALL_OPERATIONAL_ATTRS), /* all Operational Attributes ("+") */	BER_BVC(LDAP_FEATURE_ALL_OPERATIONAL_ATTRS), /* All Op Attrs (+) */
BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS), /* OCs in Attributes List */	BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS), /* OCs in Attrs List (+person) */
BER_BVC(LDAP_FEATURE_ABSOLUTE_FILTERS), /* (&) and (\|) search filters */	BER_BVC(LDAP_FEATURE_ABSOLUTE_FILTERS), /* (&) and (\|) search filters */
BER_BVC(LDAP_FEATURE_LANGUAGE_TAG_OPTIONS), /* Language Tag Options */	BER_BVC(LDAP_FEATURE_LANGUAGE_TAG_OPTIONS), /* Language Tag Options */
BER_BVC(LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS), /* Language Range Options */	BER_BVC(LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS), /* Language Range Options */
	BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT), /* Modify/increment */
{0,NULL}	{0,NULL}
};	};

Line 37 root_dse_info(	Line 43 root_dse_info(
const char **text )	const char **text )
{	{
Entry *e;	Entry *e;
struct berval vals[2], *bv;	struct berval vals[2], *bv;
	struct berval nvals[2];
int i, j;	int i, j;
char ** supportedSASLMechanisms;	char ** supportedSASLMechanisms;

Line 47 root_dse_info(	Line 54 root_dse_info(
= slap_schema.si_ad_objectClass;	= slap_schema.si_ad_objectClass;
AttributeDescription *ad_namingContexts	AttributeDescription *ad_namingContexts
= slap_schema.si_ad_namingContexts;	= slap_schema.si_ad_namingContexts;
AttributeDescription *ad_supportedControl
= slap_schema.si_ad_supportedControl;
AttributeDescription *ad_supportedExtension	AttributeDescription *ad_supportedExtension
= slap_schema.si_ad_supportedExtension;	= slap_schema.si_ad_supportedExtension;
AttributeDescription *ad_supportedLDAPVersion	AttributeDescription *ad_supportedLDAPVersion
Line 63 root_dse_info(	Line 68 root_dse_info(
= slap_schema.si_ad_ref;	= slap_schema.si_ad_ref;

vals[1].bv_val = NULL;	vals[1].bv_val = NULL;
	nvals[1].bv_val = NULL;

e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );	e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );

Line 91 root_dse_info(	Line 97 root_dse_info(

vals[0].bv_val = "top";	vals[0].bv_val = "top";
vals[0].bv_len = sizeof("top")-1;	vals[0].bv_len = sizeof("top")-1;
if( attr_merge( e, ad_objectClass, vals ) )	if( attr_merge( e, ad_objectClass, vals, NULL ) ) {
return LDAP_OTHER;	return LDAP_OTHER;
	}

vals[0].bv_val = "OpenLDAProotDSE";	vals[0].bv_val = "OpenLDAProotDSE";
vals[0].bv_len = sizeof("OpenLDAProotDSE")-1;	vals[0].bv_len = sizeof("OpenLDAProotDSE")-1;
if( attr_merge( e, ad_objectClass, vals ) )	if( attr_merge( e, ad_objectClass, vals, NULL ) ) {
return LDAP_OTHER;	return LDAP_OTHER;
if( attr_merge( e, ad_structuralObjectClass, vals ) )	}
	if( attr_merge( e, ad_structuralObjectClass, vals, NULL ) ) {
return LDAP_OTHER;	return LDAP_OTHER;
	}

for ( i = 0; i < nbackends; i++ ) {	for ( i = 0; i < nbackends; i++ ) {
if ( backends[i].be_flags & SLAP_BFLAG_MONITOR ) {	if ( backends[i].be_flags & SLAP_BFLAG_MONITOR ) {
vals[0] = backends[i].be_suffix[0];	vals[0] = backends[i].be_suffix[0];
if( attr_merge( e, ad_monitorContext, vals ) )	nvals[0] = backends[i].be_nsuffix[0];
	if( attr_merge( e, ad_monitorContext, vals, nvals ) ) {
return LDAP_OTHER;	return LDAP_OTHER;
	}
continue;	continue;
}	}
if ( backends[i].be_flags & SLAP_BFLAG_GLUE_SUBORDINATE ) {	if ( SLAP_GLUE_SUBORDINATE( &backends[i] ) ) {
continue;	continue;
}	}
for ( j = 0; backends[i].be_suffix[j].bv_val != NULL; j++ ) {	for ( j = 0; backends[i].be_suffix[j].bv_val != NULL; j++ ) {
vals[0] = backends[i].be_suffix[j];	vals[0] = backends[i].be_suffix[j];
if( attr_merge( e, ad_namingContexts, vals ) )	nvals[0] = backends[i].be_nsuffix[0];
	if( attr_merge( e, ad_namingContexts, vals, nvals ) ) {
return LDAP_OTHER;	return LDAP_OTHER;
	}
}	}
}	}

/* altServer unsupported */	/* altServer unsupported */

/* supportedControl */	/* supportedControl */
for ( i=0; (vals[0].bv_val = get_supported_ctrl(i)) != NULL; i++ ) {	if ( controls_root_dse_info( e ) != 0 ) {
vals[0].bv_len = strlen( vals[0].bv_val );	return LDAP_OTHER;
if( attr_merge( e, ad_supportedControl, vals ) )
return LDAP_OTHER;
}	}

/* supportedExtension */	/* supportedExtension */
for ( i=0; (bv = get_supported_extop(i)) != NULL; i++ ) {	if ( exop_root_dse_info( e ) != 0 ) {
	return LDAP_OTHER;
	}

	#ifdef LDAP_SLAPI
	/* netscape supportedExtension */
	for ( i = 0; (bv = ns_get_supported_extop(i)) != NULL; i++ ) {
vals[0] = *bv;	vals[0] = *bv;
if( attr_merge( e, ad_supportedExtension, vals ) )	if( attr_merge( e, ad_supportedExtension, vals, NULL )) {
return LDAP_OTHER;	return LDAP_OTHER;
	}
}	}
	#endif /* LDAP_SLAPI */

/* supportedFeatures */	/* supportedFeatures */
if( attr_merge( e, ad_supportedFeatures, supportedFeatures ) )	if( attr_merge( e, ad_supportedFeatures, supportedFeatures, NULL ) ) {
return LDAP_OTHER;	return LDAP_OTHER;
	}

/* supportedLDAPVersion */	/* supportedLDAPVersion */
for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {	for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {
Line 150 root_dse_info(	Line 170 root_dse_info(
snprintf(buf, sizeof buf, "%d", i);	snprintf(buf, sizeof buf, "%d", i);
vals[0].bv_val = buf;	vals[0].bv_val = buf;
vals[0].bv_len = strlen( vals[0].bv_val );	vals[0].bv_len = strlen( vals[0].bv_val );
if( attr_merge( e, ad_supportedLDAPVersion, vals ) )	if( attr_merge( e, ad_supportedLDAPVersion, vals, NULL ) ) {
return LDAP_OTHER;	return LDAP_OTHER;
	}
}	}

/* supportedSASLMechanism */	/* supportedSASLMechanism */
Line 161 root_dse_info(	Line 182 root_dse_info(
for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) {	for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) {
vals[0].bv_val = supportedSASLMechanisms[i];	vals[0].bv_val = supportedSASLMechanisms[i];
vals[0].bv_len = strlen( vals[0].bv_val );	vals[0].bv_len = strlen( vals[0].bv_val );
if( attr_merge( e, ad_supportedSASLMechanisms, vals ) )	if( attr_merge( e, ad_supportedSASLMechanisms, vals, NULL ) ) {
return LDAP_OTHER;	return LDAP_OTHER;
	}
}	}
ldap_charray_free( supportedSASLMechanisms );	ldap_charray_free( supportedSASLMechanisms );
}	}

if ( default_referral != NULL ) {	if ( default_referral != NULL ) {
if( attr_merge( e, ad_ref, default_referral ) )	if( attr_merge( e, ad_ref, default_referral, NULL /* FIXME */ ) ) {
return LDAP_OTHER;	return LDAP_OTHER;
	}
}	}

if( usr_attr != NULL) {	if( usr_attr != NULL) {
Attribute *a;	Attribute *a;
for( a = usr_attr->e_attrs; a != NULL; a = a->a_next ) {	for( a = usr_attr->e_attrs; a != NULL; a = a->a_next ) {
if( attr_merge( e, a->a_desc, a->a_vals ) )	if( attr_merge( e, a->a_desc, a->a_vals,
	(a->a_nvals == a->a_vals) ? NULL : a->a_nvals ) )
	{
return LDAP_OTHER;	return LDAP_OTHER;
	}
}	}
}	}

Line 213 int read_root_dse_file( const char *fnam	Line 239 int read_root_dse_file( const char *fnam
Debug( LDAP_DEBUG_ANY,	Debug( LDAP_DEBUG_ANY,
"read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );	"read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );
#endif	#endif
	fclose( fp );
return LDAP_OTHER;	return LDAP_OTHER;
}	}
usr_attr->e_attrs = NULL;	usr_attr->e_attrs = NULL;
Line 224 int read_root_dse_file( const char *fnam	Line 251 int read_root_dse_file( const char *fnam
if( e == NULL ) {	if( e == NULL ) {
fprintf( stderr, "root_dse: could not parse entry (line=%d)\n",	fprintf( stderr, "root_dse: could not parse entry (line=%d)\n",
lineno );	lineno );
entry_free( e );	rc = EXIT_FAILURE;
entry_free( usr_attr );	break;
usr_attr = NULL;
return EXIT_FAILURE;
}	}

/* make sure the DN is the empty DN */	/* make sure the DN is the empty DN */
Line 236 int read_root_dse_file( const char *fnam	Line 261 int read_root_dse_file( const char *fnam
"root_dse: invalid rootDSE - dn=\"%s\" (line=%d)\n",	"root_dse: invalid rootDSE - dn=\"%s\" (line=%d)\n",
e->e_dn, lineno );	e->e_dn, lineno );
entry_free( e );	entry_free( e );
entry_free( usr_attr );	rc = EXIT_FAILURE;
usr_attr = NULL;	break;
return EXIT_FAILURE;
}	}

/*	/*
Line 248 int read_root_dse_file( const char *fnam	Line 272 int read_root_dse_file( const char *fnam
*/	*/

for(a = e->e_attrs; a != NULL; a = a->a_next) {	for(a = e->e_attrs; a != NULL; a = a->a_next) {
if( attr_merge( usr_attr, a->a_desc, a->a_vals ) )	if( attr_merge( usr_attr, a->a_desc, a->a_vals,
return LDAP_OTHER;	(a->a_nvals == a->a_vals) ? NULL : a->a_nvals ) )
	{
	rc = LDAP_OTHER;
	break;
	}
}	}

entry_free( e );	entry_free( e );
	if (rc) break;
	}

	if (rc) {
	entry_free( usr_attr );
	usr_attr = NULL;
}	}

ch_free( buf );	ch_free( buf );

	fclose( fp );

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;	return rc;
}	}

Removed from v.1.69
changed lines
	Added in v.1.81.2.2