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.55 and 1.56

version 1.55, 2002/01/04 20:17:47	version 1.56, 2002/01/04 22:49:58
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.54 2002/01/03 07:02:17 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.55 2002/01/04 20:17:47 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 58 root_dse_info(	Line 58 root_dse_info(
AttributeDescription *ad_ref	AttributeDescription *ad_ref
= slap_schema.si_ad_ref;	= slap_schema.si_ad_ref;

Attribute *a;

vals[1].bv_val = NULL;	vals[1].bv_val = NULL;

e = (Entry *) ch_calloc( 1, sizeof(Entry) );	e = (Entry *) ch_calloc( 1, sizeof(Entry) );
Line 150 root_dse_info(	Line 148 root_dse_info(
}	}

if( usr_attr != NULL) {	if( usr_attr != NULL) {
for(a = usr_attr->e_attrs; a != NULL; a = a->a_next) {	Attribute *a;
	for( a = usr_attr->e_attrs; a != NULL; a = a->a_next ) {
attr_merge( e, a->a_desc, a->a_vals );	attr_merge( e, a->a_desc, a->a_vals );
}	}
}	}
Line 171 int read_root_dse_file( const char *fnam	Line 170 int read_root_dse_file( const char *fnam
int rc = 0, lineno = 0, lmax = 0;	int rc = 0, lineno = 0, lmax = 0;
char *buf = NULL;	char *buf = NULL;

Attribute *a;

if ( (fp = fopen( fname, "r" )) == NULL ) {	if ( (fp = fopen( fname, "r" )) == NULL ) {
Debug( LDAP_DEBUG_ANY,	Debug( LDAP_DEBUG_ANY,
"could not open rootdse attr file \"%s\" - absolute path?\n",	"could not open rootdse attr file \"%s\" - absolute path?\n",
Line 186 int read_root_dse_file( const char *fnam	Line 183 int read_root_dse_file( const char *fnam

while( ldif_read_record( fp, &lineno, &buf, &lmax ) ) {	while( ldif_read_record( fp, &lineno, &buf, &lmax ) ) {
Entry *e = str2entry( buf );	Entry *e = str2entry( buf );
	Attribute *a;

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",

Removed from v.1.55
changed lines
	Added in v.1.56