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.19 and 1.33

version 1.19, 1999/09/16 00:31:29	version 1.33, 2000/05/16 16:13:08
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.18 1999/09/08 17:06:34 kdz Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.32 2000/05/16 14:22:52 kurt Exp $ */
/* root_dse.c - Provides the ROOT DSA-Specific Entry	/* root_dse.c - Provides the ROOT DSA-Specific Entry
*	*
* Copyright 1999 The OpenLDAP Foundation.	* Copyright 1999-2000 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 are permitted only
Line 17	Line 17

#include "slap.h"	#include "slap.h"

void	int
root_dse_info( Connection conn, Operation op, char **attrs, int attrsonly )	root_dse_info( Entry entry, char text )
{	{
char buf[BUFSIZ];	char buf[BUFSIZ];
Entry *e;	Entry *e;
Line 26 root_dse_info( Connection *conn, Operati	Line 26 root_dse_info( Connection *conn, Operati
struct berval *vals[2];	struct berval *vals[2];
int i, j;	int i, j;

	#ifdef SLAPD_SCHEMA_NOT_COMPAT
	AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;
	AttributeDescription *ad_namingContexts = slap_schema.si_ad_namingContexts;
	AttributeDescription *ad_supportedControl = slap_schema.si_ad_supportedControl;
	AttributeDescription *ad_supportedExtension = slap_schema.si_ad_supportedExtension;
	AttributeDescription *ad_supportedLDAPVersion = slap_schema.si_ad_supportedLDAPVersion;
	AttributeDescription *ad_supportedSASLMechanisms = slap_schema.si_ad_supportedSASLMechanisms;
	#ifdef SLAPD_ACI_ENABLED
	AttributeDescription *ad_supportedACIMechanisms = slap_schema.si_ad_supportedACIMechanisms;
	#endif
	AttributeDescription *ad_ref = slap_schema.si_ad_ref;
	#else
	char *ad_objectClass = "objectClass";
	char *ad_namingContexts = "namingContexts";
	char *ad_supportedControl = "supportedControl";
	char *ad_supportedExtension = "supportedExtension";
	char *ad_supportedLDAPVersion = "supportedLDAPVersion";
	char *ad_supportedSASLMechanisms = "supportedSASLMechanisms";
	#ifdef SLAPD_ACI_ENABLED
	char *ad_supportedACIMechanisms = "supportedACIMechanisms";
	#endif
	char *ad_ref = "ref";
	#endif

vals[0] = &val;	vals[0] = &val;
vals[1] = NULL;	vals[1] = NULL;

Line 34 root_dse_info( Connection *conn, Operati	Line 58 root_dse_info( Connection *conn, Operati
e->e_attrs = NULL;	e->e_attrs = NULL;
e->e_dn = ch_strdup( LDAP_ROOT_DSE );	e->e_dn = ch_strdup( LDAP_ROOT_DSE );
e->e_ndn = ch_strdup( LDAP_ROOT_DSE );	e->e_ndn = ch_strdup( LDAP_ROOT_DSE );
(void) dn_normalize_case( e->e_ndn );	(void) dn_normalize( e->e_ndn );
e->e_private = NULL;	e->e_private = NULL;

	val.bv_val = "top";
	val.bv_len = sizeof("top")-1;
	attr_merge( e, ad_objectClass, vals );

	val.bv_val = "OpenLDAProotDSE";
	val.bv_len = sizeof("OpenLDAProotDSE")-1;
	attr_merge( e, ad_objectClass, vals );

for ( i = 0; i < nbackends; i++ ) {	for ( i = 0; i < nbackends; i++ ) {
for ( j = 0; backends[i].be_suffix[j] != NULL; j++ ) {	for ( j = 0; backends[i].be_suffix[j] != NULL; j++ ) {
val.bv_val = backends[i].be_suffix[j];	val.bv_val = backends[i].be_suffix[j];
val.bv_len = strlen( val.bv_val );	val.bv_len = strlen( val.bv_val );
attr_merge( e, "namingContexts", vals );	attr_merge( e, ad_namingContexts, vals );
}	}
}	}

#if defined( SLAPD_MONITOR_DN )
val.bv_val = SLAPD_MONITOR_DN;
val.bv_len = strlen( val.bv_val );
attr_merge( e, "namingContexts", vals );
/* subschemasubentry is added by send_search_entry() */
#endif

#if defined( SLAPD_CONFIG_DN )
val.bv_val = SLAPD_CONFIG_DN;
val.bv_len = strlen( val.bv_val );
attr_merge( e, "namingContexts", vals );
#endif

#if defined( SLAPD_SCHEMA_DN )
val.bv_val = SLAPD_SCHEMA_DN;
val.bv_len = strlen( val.bv_val );
attr_merge( e, "namingContexts", vals );
#endif

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

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

/* supportedExtension */	/* supportedExtension */
for ( i=0; supportedExtensions[i] != NULL; i++ ) {	for ( i=0; (val.bv_val = get_supported_extop(i)) != NULL; i++ ) {
val.bv_val = supportedExtensions[i];
val.bv_len = strlen( val.bv_val );	val.bv_len = strlen( val.bv_val );
attr_merge( e, "supportedExtension", vals );	attr_merge( e, ad_supportedExtension, vals );
}	}

/* supportedLDAPVersion */	/* supportedLDAPVersion */
Line 85 root_dse_info( Connection *conn, Operati	Line 97 root_dse_info( Connection *conn, Operati
sprintf(buf,"%d",i);	sprintf(buf,"%d",i);
val.bv_val = buf;	val.bv_val = buf;
val.bv_len = strlen( val.bv_val );	val.bv_len = strlen( val.bv_val );
attr_merge( e, "supportedLDAPVersion", vals );	attr_merge( e, ad_supportedLDAPVersion, vals );
}	}

/* supportedSASLMechanism */	/* supportedSASLMechanism */
Line 93 root_dse_info( Connection *conn, Operati	Line 105 root_dse_info( Connection *conn, Operati
for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) {	for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) {
val.bv_val = supportedSASLMechanisms[i];	val.bv_val = supportedSASLMechanisms[i];
val.bv_len = strlen( val.bv_val );	val.bv_len = strlen( val.bv_val );
attr_merge( e, "supportedSASLMechanisms", vals );	attr_merge( e, ad_supportedSASLMechanisms, vals );
}	}
}	}

if ( default_referral != NULL ) {	#ifdef SLAPD_ACI_ENABLED
attr_merge( e, "ref", default_referral );	/* supportedACIMechanisms */
	for ( i=0; (val.bv_val = get_supported_acimech(i)) != NULL; i++ ) {
	val.bv_len = strlen( val.bv_val );
	attr_merge( e, ad_supportedACIMechanisms, vals );
}	}
	#endif

val.bv_val = "top";	if ( default_referral != NULL ) {
val.bv_len = sizeof("top")-1;	attr_merge( e, ad_ref, default_referral );
attr_merge( e, "objectClass", vals );	}

val.bv_val = "LDAPsubentry";
val.bv_len = sizeof("LDAPsubentry")-1;
attr_merge( e, "objectClass", vals );

val.bv_val = "extensibleObject";
val.bv_len = sizeof("extensibleObject")-1;
attr_merge( e, "objectClass", vals );

send_search_entry( &backends[0], conn, op,
e, attrs, attrsonly, NULL );
send_search_result( conn, op, LDAP_SUCCESS,
NULL, NULL, NULL, NULL, 1 );

entry_free( e );	*entry = e;
	return LDAP_SUCCESS;
}	}

Removed from v.1.19
changed lines
	Added in v.1.33