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.7 and 1.8

version 1.7, 1999/07/01 19:20:45	version 1.8, 1999/07/07 16:51:39
Line 19	Line 19
void	void
root_dse_info( Connection conn, Operation op, char **attrs, int attrsonly )	root_dse_info( Connection conn, Operation op, char **attrs, int attrsonly )
{	{
	char buf[BUFSIZ];
Entry *e;	Entry *e;
char buf[BUFSIZ];
struct berval val;	struct berval val;
struct berval *vals[2];	struct berval *vals[2];
int i, j;	int i, j;
Line 37 root_dse_info( Connection *conn, Operati	Line 37 root_dse_info( Connection *conn, Operati

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++ ) {
strcpy( buf, backends[i].be_suffix[j] );	val.bv_val = backends[i].be_suffix[j];
val.bv_val = buf;	val.bv_len = strlen( val.bv_val );
val.bv_len = strlen( buf );
attr_merge( e, "namingContexts", vals );	attr_merge( e, "namingContexts", vals );
}	}
}	}

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

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

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

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

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

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

Line 89 root_dse_info( Connection *conn, Operati	Line 82 root_dse_info( Connection *conn, Operati
for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {	for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {
sprintf(buf,"%d",i);	sprintf(buf,"%d",i);
val.bv_val = buf;	val.bv_val = buf;
val.bv_len = strlen( buf );	val.bv_len = strlen( val.bv_val );
attr_merge( e, "supportedLDAPVersion", vals );	attr_merge( e, "supportedLDAPVersion", vals );
}	}

/* supportedSASLMechanism */	/* supportedSASLMechanism */
for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) {	for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) {
strcpy( buf, supportedSASLMechanisms[i] );	val.bv_val = supportedSASLMechanisms[i];
val.bv_val = buf;	val.bv_len = strlen( val.bv_val );
val.bv_len = strlen( buf );
attr_merge( e, "supportedSASLMechanism", vals );	attr_merge( e, "supportedSASLMechanism", vals );
}	}


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

entry_free( e );	entry_free( e );

Removed from v.1.7
changed lines
	Added in v.1.8