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 and 1.81.2.8

version 1.81, 2003/04/05 01:35:17	version 1.81.2.8, 2003/12/29 18:10:40
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.80 2003/03/24 00:56:56 hyc Exp $ */	/* 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.7 2003/12/17 21:04:09 kurt Exp $ */
	/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*	*
* Copyright 1999-2003 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, with or without
* as authorized by the OpenLDAP Public License. A copy of this	* modification, are permitted only as authorized by the OpenLDAP
* license is available at http://www.OpenLDAP.org/license.html or	* Public License.
* in file LICENSE in the top-level directory of the distribution.	*
	* A copy of this license is available in the file LICENSE in the
	* top-level directory of the distribution or, alternatively, at
	* <http://www.OpenLDAP.org/license.html>.
*/	*/

#include "portable.h"	#include "portable.h"
Line 21	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 Operational Attributes ("+") */	BER_BVC(LDAP_FEATURE_ALL_OP_ATTRS), /* All Op Attrs (+) */
BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS), /* OCs in Attributes List */	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
	BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE), /* "children" search scope */
	BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT), /* Modify/increment */
	#endif
{0,NULL}	{0,NULL}
};	};

Line 96 root_dse_info(	Line 105 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, NULL ) )	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, NULL ) )	if( attr_merge( e, ad_objectClass, vals, NULL ) ) {
return LDAP_OTHER;	return LDAP_OTHER;
if( attr_merge( e, ad_structuralObjectClass, vals, NULL ) )	}
	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];
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 ) ) {
{
return LDAP_OTHER;	return LDAP_OTHER;
}	}
continue;	continue;
Line 124 root_dse_info(	Line 133 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];
nvals[0] = backends[i].be_nsuffix[0];	nvals[0] = backends[i].be_nsuffix[0];
if( attr_merge( e, ad_namingContexts, vals, nvals ) )	if( attr_merge( e, ad_namingContexts, vals, nvals ) ) {
{
return LDAP_OTHER;	return LDAP_OTHER;
}	}
}	}
Line 139 root_dse_info(	Line 147 root_dse_info(
}	}

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

#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;
}	}
}	}
#endif /* LDAP_SLAPI */	#endif /* LDAP_SLAPI */

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

Line 177 root_dse_info(	Line 178 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, NULL ) )	if( attr_merge( e, ad_supportedLDAPVersion, vals, NULL ) ) {
{
return LDAP_OTHER;	return LDAP_OTHER;
}	}
}	}
Line 190 root_dse_info(	Line 190 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, NULL ) )	if( attr_merge( e, ad_supportedSASLMechanisms, vals, NULL ) ) {
{
return LDAP_OTHER;	return LDAP_OTHER;
}	}
}	}
Line 199 root_dse_info(	Line 198 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;	return LDAP_OTHER;
}	}
}	}
Line 209 root_dse_info(	Line 207 root_dse_info(
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 ) )	(a->a_nvals == a->a_vals) ? NULL : a->a_nvals ) )
{	{
return LDAP_OTHER;	return LDAP_OTHER;
}	}
Line 283 int read_root_dse_file( const char *fnam	Line 281 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,
(a->a_nvals == a->a_vals) ? NULL : a->a_nvals ) )	(a->a_nvals == a->a_vals) ? NULL : a->a_nvals ) )
{	{
rc = LDAP_OTHER;	rc = LDAP_OTHER;
break;	break;

Removed from v.1.81
changed lines
	Added in v.1.81.2.8