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.95 and 1.95.2.3

version 1.95, 2004/10/06 03:51:39	version 1.95.2.3, 2005/03/14 22:33:12
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.93 2004/09/04 02:54:30 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.100 2005/03/14 22:21:00 hyc 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-2004 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 34 static struct berval supportedFeatures[]	Line 34 static struct berval supportedFeatures[]
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
	#ifdef LDAP_FEATURE_MODIFY_INCREMENT
BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT), /* Modify/increment */	BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT), /* Modify/increment */
#endif	#endif
{0,NULL}	{0,NULL}
Line 72 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 127 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++ ) {

Removed from v.1.95
changed lines
	Added in v.1.95.2.3