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.55 and 1.70

version 1.55, 2002/01/04 20:17:47	version 1.70, 2002/11/10 05:48:55
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.54 2002/01/03 07:02:17 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.69 2002/11/08 16:13:20 julius 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-2002 The OpenLDAP Foundation.
Line 17	Line 17

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

static char *supportedFeatures[] = {	static struct berval supportedFeatures[] = {
"1.3.6.1.4.1.4203.1.5.1", /* all Operational Attributes ("+") */	BER_BVC(LDAP_FEATURE_ALL_OPERATIONAL_ATTRS), /* all Operational Attributes ("+") */
"1.3.6.1.4.1.4203.1.5.2", /* OCs in Attributes List */	BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS), /* OCs in Attributes List */
"1.3.6.1.4.1.4203.1.5.3", /* (&) and (\|) search filters */	BER_BVC(LDAP_FEATURE_ABSOLUTE_FILTERS), /* (&) and (\|) search filters */
NULL	BER_BVC(LDAP_FEATURE_LANGUAGE_TAG_OPTIONS), /* Language Tag Options */
	BER_BVC(LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS), /* Language Range Options */
	{0,NULL}
};	};

static Entry *usr_attr = NULL;	static Entry *usr_attr = NULL;
Line 33 root_dse_info(	Line 36 root_dse_info(
Entry **entry,	Entry **entry,
const char **text )	const char **text )
{	{
char buf[BUFSIZ];
Entry *e;	Entry *e;
struct berval vals[2];	struct berval vals[2], *bv;
int i, j;	int i, j;
char ** supportedSASLMechanisms;	char ** supportedSASLMechanisms;

Line 55 root_dse_info(	Line 57 root_dse_info(
= slap_schema.si_ad_supportedSASLMechanisms;	= slap_schema.si_ad_supportedSASLMechanisms;
AttributeDescription *ad_supportedFeatures	AttributeDescription *ad_supportedFeatures
= slap_schema.si_ad_supportedFeatures;	= slap_schema.si_ad_supportedFeatures;
	AttributeDescription *ad_monitorContext
	= slap_schema.si_ad_monitorContext;
AttributeDescription *ad_ref	AttributeDescription *ad_ref
= slap_schema.si_ad_ref;	= slap_schema.si_ad_ref;

Attribute *a;

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

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

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

e->e_attrs = NULL;	e->e_attrs = NULL;
e->e_name.bv_val = ch_strdup( LDAP_ROOT_DSE );	e->e_name.bv_val = ch_strdup( LDAP_ROOT_DSE );
Line 76 root_dse_info(	Line 89 root_dse_info(

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

vals[0].bv_val = "OpenLDAProotDSE";
vals[0].bv_len = sizeof("OpenLDAProotDSE")-1;
attr_merge( e, ad_structuralObjectClass, vals );

vals[0].bv_val = "top";	vals[0].bv_val = "top";
vals[0].bv_len = sizeof("top")-1;	vals[0].bv_len = sizeof("top")-1;
attr_merge( e, ad_objectClass, vals );	if( attr_merge( e, ad_objectClass, vals ) )
	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;
attr_merge( e, ad_objectClass, vals );	if( attr_merge( e, ad_objectClass, vals ) )
	return LDAP_OTHER;
	if( attr_merge( e, ad_structuralObjectClass, vals ) )
	return LDAP_OTHER;

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

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

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

/* supportedExtension */	/* supportedExtension */
for ( i=0; (vals[0].bv_val = get_supported_extop(i)) != NULL; i++ ) {	for ( i=0; (bv = get_supported_extop(i)) != NULL; i++ ) {
vals[0].bv_len = strlen( vals[0].bv_val );	vals[0] = *bv;
attr_merge( e, ad_supportedExtension, vals );	if( attr_merge( e, ad_supportedExtension, vals ) )
	return LDAP_OTHER;
}	}

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

/* supportedLDAPVersion */	/* supportedLDAPVersion */
for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {	for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {
	char buf[BUFSIZ];
if (!( global_allows & SLAP_ALLOW_BIND_V2 ) &&	if (!( global_allows & SLAP_ALLOW_BIND_V2 ) &&
( i < LDAP_VERSION3 ) )	( i < LDAP_VERSION3 ) )
{	{
/* version 2 and lower are disallowed */	/* version 2 and lower are disallowed */
continue;	continue;
}	}
sprintf(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 );
attr_merge( e, ad_supportedLDAPVersion, vals );	if( attr_merge( e, ad_supportedLDAPVersion, vals ) )
	return LDAP_OTHER;
}	}

/* supportedSASLMechanism */	/* supportedSASLMechanism */
Line 140 root_dse_info(	Line 161 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 );
attr_merge( e, ad_supportedSASLMechanisms, vals );	if( attr_merge( e, ad_supportedSASLMechanisms, vals ) )
	return LDAP_OTHER;
}	}
charray_free( supportedSASLMechanisms );	ldap_charray_free( supportedSASLMechanisms );
}	}

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

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

Line 171 int read_root_dse_file( const char *fnam	Line 196 int read_root_dse_file( const char *fnam
int rc = 0, lineno = 0, lmax = 0;	int rc = 0, lineno = 0, lmax = 0;
char *buf = NULL;	char *buf = NULL;

Attribute *a;

if ( (fp = fopen( fname, "r" )) == NULL ) {	if ( (fp = fopen( fname, "r" )) == NULL ) {
Debug( LDAP_DEBUG_ANY,	Debug( LDAP_DEBUG_ANY,
"could not open rootdse attr file \"%s\" - absolute path?\n",	"could not open rootdse attr file \"%s\" - absolute path?\n",
Line 181 int read_root_dse_file( const char *fnam	Line 204 int read_root_dse_file( const char *fnam
return EXIT_FAILURE;	return EXIT_FAILURE;
}	}

usr_attr = (Entry *) ch_calloc( 1, sizeof(Entry) );	usr_attr = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
	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,
	"read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );
	#endif
	return LDAP_OTHER;
	}
usr_attr->e_attrs = NULL;	usr_attr->e_attrs = NULL;

while( ldif_read_record( fp, &lineno, &buf, &lmax ) ) {	while( ldif_read_record( fp, &lineno, &buf, &lmax ) ) {
Entry *e = str2entry( buf );	Entry *e = str2entry( buf );
	Attribute *a;

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 );
entry_free( usr_attr );	entry_free( usr_attr );
usr_attr = NULL;	usr_attr = NULL;
return EXIT_FAILURE;	return EXIT_FAILURE;
Line 214 int read_root_dse_file( const char *fnam	Line 247 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) {
attr_merge( usr_attr, a->a_desc, a->a_vals );	if( attr_merge( usr_attr, a->a_desc, a->a_vals ) )
	return LDAP_OTHER;
}	}

entry_free( e );	entry_free( e );

Removed from v.1.55
changed lines
	Added in v.1.70