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.61.2.5 and 1.61.2.6

version 1.61.2.5, 2002/08/29 02:10:44	version 1.61.2.6, 2002/11/11 02:42:37
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.61.2.4 2002/07/28 19:17:38 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.61.2.5 2002/08/29 02:10:44 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-2002 The OpenLDAP Foundation.
Line 64 root_dse_info(	Line 64 root_dse_info(

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 80 root_dse_info(	Line 91 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;
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 ) )
attr_merge( e, ad_structuralObjectClass, 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_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];
attr_merge( e, ad_monitorContext, vals );	if( attr_merge( e, ad_monitorContext, vals ) )
	return LDAP_OTHER;
continue;	continue;
}	}
if ( backends[i].be_flags & SLAP_BFLAG_GLUE_SUBORDINATE ) {	if ( backends[i].be_flags & SLAP_BFLAG_GLUE_SUBORDINATE ) {
Line 98 root_dse_info(	Line 113 root_dse_info(
}	}
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];
attr_merge( e, ad_namingContexts, vals );	if( attr_merge( e, ad_namingContexts, vals ) )
	return LDAP_OTHER;
}	}
}	}

Line 107 root_dse_info(	Line 123 root_dse_info(
/* supportedControl */	/* supportedControl */
for ( i=0; (vals[0].bv_val = get_supported_ctrl(i)) != NULL; i++ ) {	for ( i=0; (vals[0].bv_val = get_supported_ctrl(i)) != NULL; 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; (bv = get_supported_extop(i)) != NULL; i++ ) {	for ( i=0; (bv = get_supported_extop(i)) != NULL; i++ ) {
vals[0] = *bv;	vals[0] = *bv;
attr_merge( e, ad_supportedExtension, vals );	if( attr_merge( e, ad_supportedExtension, vals ) )
	return LDAP_OTHER;
}	}

/* supportedFeatures */	/* supportedFeatures */
attr_merge( e, ad_supportedFeatures, supportedFeatures );	if( attr_merge( e, ad_supportedFeatures, supportedFeatures ) )
	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 131 root_dse_info(	Line 150 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 );
attr_merge( e, ad_supportedLDAPVersion, vals );	if( attr_merge( e, ad_supportedLDAPVersion, vals ) )
	return LDAP_OTHER;
}	}

/* supportedSASLMechanism */	/* supportedSASLMechanism */
Line 141 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;
}	}
ldap_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) {
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 ) {
attr_merge( e, a->a_desc, a->a_vals );	if( attr_merge( e, a->a_desc, a->a_vals ) )
	return LDAP_OTHER;
}	}
}	}

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 ) ) {
Line 191 int read_root_dse_file( const char *fnam	Line 224 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 );
entry_free( usr_attr );	entry_free( usr_attr );
usr_attr = NULL;	usr_attr = NULL;
return EXIT_FAILURE;	return EXIT_FAILURE;
Line 215 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.61.2.5
changed lines
	Added in v.1.61.2.6