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.110 and 1.119

version 1.110, 2005/08/12 19:24:13	version 1.119, 2006/08/28 23:43:24
Line 1	Line 1
/* root_dse.c - Provides the Root DSA-Specific Entry */	/* root_dse.c - Provides the Root DSA-Specific Entry */
/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.109 2005/07/22 11:18:28 hallvard Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.118 2006/08/25 18:05:14 kurt Exp $ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.	/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*	*
* Copyright 1999-2005 The OpenLDAP Foundation.	* Copyright 1999-2006 The OpenLDAP Foundation.
* All rights reserved.	* All rights reserved.
*	*
* Redistribution and use in source and binary forms, with or without	* Redistribution and use in source and binary forms, with or without
Line 28	Line 28
#include "slapi/slapi.h"	#include "slapi/slapi.h"
#endif	#endif

static struct berval supportedFeatures[] = {	static struct berval builtin_supportedFeatures[] = {
BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT), /* Modify/increment */	BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT), /* Modify/increment */
BER_BVC(LDAP_FEATURE_ALL_OP_ATTRS), /* All Op Attrs (+) */	BER_BVC(LDAP_FEATURE_ALL_OP_ATTRS), /* All Op Attrs (+) */
BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS), /* OCs in Attrs List (@class) */	BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS), /* OCs in Attrs List (@class) */
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 */
#ifdef LDAP_FEATURE_SUBORDINATE_SCOPE	#ifdef LDAP_DEVEL
BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE), /* "children" search scope */	BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE), /* "children" search scope */
#endif	#endif
{0,NULL}	BER_BVNULL
};	};
	static struct berval *supportedFeatures;

static Entry *usr_attr = NULL;	static Entry *usr_attr = NULL;

	/*
	* allow modules to register functions that muck with the root DSE entry
	*/

	typedef struct entry_info_t {
	SLAP_ENTRY_INFO_FN func;
	void *arg;
	struct entry_info_t *next;
	} entry_info_t;

	static entry_info_t *extra_info;

	int
	entry_info_register( SLAP_ENTRY_INFO_FN func, void *arg )
	{
	entry_info_t *ei = ch_calloc( 1, sizeof( entry_info_t ) );

	ei->func = func;
	ei->arg = arg;

	ei->next = extra_info;
	extra_info = ei;

	return 0;
	}

	int
	entry_info_unregister( SLAP_ENTRY_INFO_FN func, void *arg )
	{
	entry_info_t **eip;

	for ( eip = &extra_info; eip != NULL; eip = &(eip)->next ) {
	if ( (eip)->func == func && (eip)->arg == arg ) {
	entry_info_t ei = eip;

	*eip = ei->next;

	ch_free( ei );

	return 0;
	}
	}

	return -1;
	}

	void
	entry_info_destroy( void )
	{
	entry_info_t **eip;

	for ( eip = &extra_info; *eip != NULL; ) {
	entry_info_t ei = eip;

	eip = &(*eip)->next;

	ch_free( ei );
	}
	}

	/*
	* Allow modules to register supported features
	*/

	static int
	supported_feature_init( void )
	{
	int i;

	if ( supportedFeatures != NULL ) {
	return 0;
	}

	for ( i = 0; !BER_BVISNULL( &builtin_supportedFeatures[ i ] ); i++ )
	;

	supportedFeatures = ch_calloc( sizeof( struct berval ), i + 1 );
	if ( supportedFeatures == NULL ) {
	return -1;
	}

	for ( i = 0; !BER_BVISNULL( &builtin_supportedFeatures[ i ] ); i++ ) {
	ber_dupbv( &supportedFeatures[ i ], &builtin_supportedFeatures[ i ] );
	}
	BER_BVZERO( &supportedFeatures[ i ] );

	return 0;
	}

	int
	supported_feature_destroy( void )
	{
	int i;

	if ( supportedFeatures == NULL ) {
	return 0;
	}

	for ( i = 0; !BER_BVISNULL( &supportedFeatures[ i ] ); i++ ) {
	ch_free( supportedFeatures[ i ].bv_val );
	}

	ch_free( supportedFeatures );
	supportedFeatures = NULL;

	return 0;
	}

	int
	supported_feature_load( struct berval *f )
	{
	struct berval *tmp;
	int i;

	supported_feature_init();

	for ( i = 0; !BER_BVISNULL( &supportedFeatures[ i ] ); i++ )
	;

	tmp = ch_realloc( supportedFeatures, sizeof( struct berval ) * ( i + 2 ) );
	if ( tmp == NULL ) {
	return -1;
	}
	supportedFeatures = tmp;

	ber_dupbv( &supportedFeatures[ i ], f );
	BER_BVZERO( &supportedFeatures[ i + 1 ] );

	return 0;
	}

int	int
root_dse_info(	root_dse_info(
Connection *conn,	Connection *conn,
Line 81 root_dse_info(	Line 213 root_dse_info(
AttributeDescription *ad_ref	AttributeDescription *ad_ref
= slap_schema.si_ad_ref;	= slap_schema.si_ad_ref;

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

if( e == NULL ) {	if( e == NULL ) {
Debug( LDAP_DEBUG_ANY,	Debug( LDAP_DEBUG_ANY,
"root_dse_info: SLAP_CALLOC failed", 0, 0, 0 );	"root_dse_info: entry_alloc failed", 0, 0, 0 );
return LDAP_OTHER;	return LDAP_OTHER;
}	}

Line 101 root_dse_info(	Line 232 root_dse_info(

e->e_private = NULL;	e->e_private = NULL;

	/* FIXME: is this really needed? */
BER_BVSTR( &val, "top" );	BER_BVSTR( &val, "top" );
if( attr_merge_one( e, ad_objectClass, &val, NULL ) ) {	if( attr_merge_one( e, ad_objectClass, &val, NULL ) ) {
	fail:
	entry_free( e );
return LDAP_OTHER;	return LDAP_OTHER;
}	}

BER_BVSTR( &val, "OpenLDAProotDSE" );	BER_BVSTR( &val, "OpenLDAProotDSE" );
if( attr_merge_one( e, ad_objectClass, &val, NULL ) ) {	if( attr_merge_one( e, ad_objectClass, &val, NULL ) ) {
return LDAP_OTHER;	goto fail;
}	}
if( attr_merge_one( e, ad_structuralObjectClass, &val, NULL ) ) {	if( attr_merge_one( e, ad_structuralObjectClass, &val, NULL ) ) {
return LDAP_OTHER;	goto fail;
}	}

LDAP_STAILQ_FOREACH( be, &backendDB, be_next ) {	LDAP_STAILQ_FOREACH( be, &backendDB, be_next ) {
Line 125 root_dse_info(	Line 259 root_dse_info(
&be->be_suffix[0],	&be->be_suffix[0],
&be->be_nsuffix[0] ) )	&be->be_nsuffix[0] ) )
{	{
return LDAP_OTHER;	goto fail;
}	}
continue;	continue;
}	}
Line 134 root_dse_info(	Line 268 root_dse_info(
&be->be_suffix[0],	&be->be_suffix[0],
& be->be_nsuffix[0] ) )	& be->be_nsuffix[0] ) )
{	{
return LDAP_OTHER;	goto fail;
}	}
continue;	continue;
}	}
Line 146 root_dse_info(	Line 280 root_dse_info(
&be->be_suffix[j],	&be->be_suffix[j],
&be->be_nsuffix[0] ) )	&be->be_nsuffix[0] ) )
{	{
return LDAP_OTHER;	goto fail;
}	}
}	}
}	}
Line 155 root_dse_info(	Line 289 root_dse_info(

/* supportedControl */	/* supportedControl */
if ( controls_root_dse_info( e ) != 0 ) {	if ( controls_root_dse_info( e ) != 0 ) {
return LDAP_OTHER;	goto fail;
}	}

/* supportedExtension */	/* supportedExtension */
if ( exop_root_dse_info( e ) != 0 ) {	if ( exop_root_dse_info( e ) != 0 ) {
return LDAP_OTHER;	goto fail;
}	}

#ifdef LDAP_SLAPI	#ifdef LDAP_SLAPI
/* netscape supportedExtension */	/* netscape supportedExtension */
for ( i = 0; (bv = slapi_int_get_supported_extop(i)) != NULL; i++ ) {	for ( i = 0; (bv = slapi_int_get_supported_extop(i)) != NULL; i++ ) {
if( attr_merge_one( e, ad_supportedExtension, bv, NULL ) ) {	if( attr_merge_one( e, ad_supportedExtension, bv, NULL ) ) {
return LDAP_OTHER;	goto fail;
}	}
}	}
#endif /* LDAP_SLAPI */	#endif /* LDAP_SLAPI */

/* supportedFeatures */	/* supportedFeatures */
	if ( supportedFeatures == NULL ) {
	supported_feature_init();
	}

if( attr_merge( e, ad_supportedFeatures, supportedFeatures, NULL ) ) {	if( attr_merge( e, ad_supportedFeatures, supportedFeatures, NULL ) ) {
return LDAP_OTHER;	goto fail;
}	}

/* supportedLDAPVersion */	/* supportedLDAPVersion */
Line 184 root_dse_info(	Line 322 root_dse_info(
* clients.	* clients.
*/	*/
for ( i=LDAP_VERSION3; i<=LDAP_VERSION_MAX; i++ ) {	for ( i=LDAP_VERSION3; i<=LDAP_VERSION_MAX; i++ ) {
char buf[BUFSIZ];	char buf[sizeof("255")];
snprintf(buf, sizeof buf, "%d", i);	snprintf(buf, sizeof buf, "%d", i);
val.bv_val = buf;	val.bv_val = buf;
val.bv_len = strlen( val.bv_val );	val.bv_len = strlen( val.bv_val );
if( attr_merge_one( e, ad_supportedLDAPVersion, &val, NULL ) ) {	if( attr_merge_one( e, ad_supportedLDAPVersion, &val, NULL ) ) {
return LDAP_OTHER;	goto fail;
}	}
}	}

Line 201 root_dse_info(	Line 339 root_dse_info(
val.bv_val = supportedSASLMechanisms[i];	val.bv_val = supportedSASLMechanisms[i];
val.bv_len = strlen( val.bv_val );	val.bv_len = strlen( val.bv_val );
if( attr_merge_one( e, ad_supportedSASLMechanisms, &val, NULL ) ) {	if( attr_merge_one( e, ad_supportedSASLMechanisms, &val, NULL ) ) {
return LDAP_OTHER;	ldap_charray_free( supportedSASLMechanisms );
	goto fail;
}	}
}	}
ldap_charray_free( supportedSASLMechanisms );	ldap_charray_free( supportedSASLMechanisms );
Line 209 root_dse_info(	Line 348 root_dse_info(

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

Line 219 root_dse_info(	Line 358 root_dse_info(
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 ) )	(a->a_nvals == a->a_vals) ? NULL : a->a_nvals ) )
{	{
return LDAP_OTHER;	goto fail;
}	}
}	}
}	}

	if ( extra_info ) {
	entry_info_t *ei = extra_info;

	for ( ; ei; ei = ei->next ) {
	ei->func( ei->arg, e );
	}
	}

*entry = e;	*entry = e;
return LDAP_SUCCESS;	return LDAP_SUCCESS;
}	}
Line 248 int read_root_dse_file( const char *fnam	Line 395 int read_root_dse_file( const char *fnam
return EXIT_FAILURE;	return EXIT_FAILURE;
}	}

usr_attr = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );	usr_attr = entry_alloc();
if( usr_attr == NULL ) {	if( usr_attr == NULL ) {
Debug( LDAP_DEBUG_ANY,	Debug( LDAP_DEBUG_ANY,
"read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );	"read_root_dse_file: entry_alloc failed", 0, 0, 0 );
ldif_close( fp );	ldif_close( fp );
return LDAP_OTHER;	return LDAP_OTHER;
}	}
Line 333 slap_discover_feature(	Line 480 slap_discover_feature(
return rc;	return rc;
}	}

rc = ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version );	rc = ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION,
	(const void *)&version );
if ( rc != LDAP_SUCCESS ) {	if ( rc != LDAP_SUCCESS ) {
goto done;	goto done;
}	}

Removed from v.1.110
changed lines
	Added in v.1.119