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.81.2.6 and 1.100

version 1.81.2.6, 2003/12/01 00:58:36	version 1.100, 2005/03/14 22:21:00
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.81.2.5 2003/11/30 22:20:26 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.99 2005/02/01 09:32:52 ando 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-2003 The OpenLDAP Foundation.	* Copyright 1999-2005 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 25	Line 25
#include "lber_pvt.h"	#include "lber_pvt.h"

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

static struct berval supportedFeatures[] = {	static struct berval supportedFeatures[] = {
BER_BVC(LDAP_FEATURE_ALL_OPERATIONAL_ATTRS), /* All Op Attrs (+) */	BER_BVC(LDAP_FEATURE_ALL_OP_ATTRS), /* All Op Attrs (+) */
BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS), /* OCs in Attrs List (+person) */	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_DEVEL	#ifdef LDAP_FEATURE_SUBORDINATE_SCOPE
BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT), /* Modify/increment */	BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE), /* "children" search scope */
	#endif
	#ifdef LDAP_FEATURE_MODIFY_INCREMENT
	BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT), /* Modify/increment */
#endif	#endif
{0,NULL}	{0,NULL}
};	};
Line 70 root_dse_info(	Line 73 root_dse_info(
= slap_schema.si_ad_supportedFeatures;	= slap_schema.si_ad_supportedFeatures;
AttributeDescription *ad_monitorContext	AttributeDescription *ad_monitorContext
= slap_schema.si_ad_monitorContext;	= slap_schema.si_ad_monitorContext;
	AttributeDescription *ad_configContext
	= slap_schema.si_ad_configContext;
AttributeDescription *ad_ref	AttributeDescription *ad_ref
= slap_schema.si_ad_ref;	= slap_schema.si_ad_ref;

Line 79 root_dse_info(	Line 84 root_dse_info(
e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );	e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );

if( e == NULL ) {	if( e == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR,
"root_dse_info: SLAP_CALLOC failed", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,	Debug( LDAP_DEBUG_ANY,
"root_dse_info: SLAP_CALLOC failed", 0, 0, 0 );	"root_dse_info: SLAP_CALLOC failed", 0, 0, 0 );
#endif
return LDAP_OTHER;	return LDAP_OTHER;
}	}

Line 117 root_dse_info(	Line 117 root_dse_info(
}	}

for ( i = 0; i < nbackends; i++ ) {	for ( i = 0; i < nbackends; i++ ) {
if ( backends[i].be_flags & SLAP_BFLAG_MONITOR ) {	if ( backends[i].be_suffix == NULL
	\|\| backends[i].be_nsuffix == NULL ) {
	/* no suffix! */
	continue;
	}
	if ( SLAP_MONITOR( &backends[i] )) {
vals[0] = backends[i].be_suffix[0];	vals[0] = backends[i].be_suffix[0];
nvals[0] = backends[i].be_nsuffix[0];	nvals[0] = backends[i].be_nsuffix[0];
if( attr_merge( e, ad_monitorContext, vals, nvals ) ) {	if( attr_merge( e, ad_monitorContext, vals, nvals ) ) {
Line 125 root_dse_info(	Line 130 root_dse_info(
}	}
continue;	continue;
}	}
if ( SLAP_GLUE_SUBORDINATE( &backends[i] ) ) {	if ( SLAP_CONFIG( &backends[i] )) {
	vals[0] = backends[i].be_suffix[0];
	nvals[0] = backends[i].be_nsuffix[0];
	if( attr_merge( e, ad_configContext, vals, nvals ) ) {
	return LDAP_OTHER;
	}
	continue;
	}
	if ( SLAP_GLUE_SUBORDINATE( &backends[i] ) && !SLAP_GLUE_ADVERTISE( &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++ ) {
Line 151 root_dse_info(	Line 164 root_dse_info(

#ifdef LDAP_SLAPI	#ifdef LDAP_SLAPI
/* netscape supportedExtension */	/* netscape supportedExtension */
for ( i = 0; (bv = ns_get_supported_extop(i)) != NULL; i++ ) {	for ( i = 0; (bv = slapi_int_get_supported_extop(i)) != NULL; i++ ) {
vals[0] = *bv;	vals[0] = *bv;
if( attr_merge( e, ad_supportedExtension, vals, NULL )) {	if( attr_merge( e, ad_supportedExtension, vals, NULL )) {
return LDAP_OTHER;	return LDAP_OTHER;
Line 238 int read_root_dse_file( const char *fnam	Line 251 int read_root_dse_file( const char *fnam

usr_attr = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );	usr_attr = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
if( usr_attr == NULL ) {	if( usr_attr == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR,
"read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );
#else
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
fclose( fp );	fclose( fp );
return LDAP_OTHER;	return LDAP_OTHER;
}	}

Removed from v.1.81.2.6
changed lines
	Added in v.1.100