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.68 and 1.70

version 1.68, 2002/11/01 17:59:53	version 1.70, 2002/11/10 05:48:55
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.67 2002/08/23 22:55:24 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.69 2002/11/08 16:13:20 julius 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 64 root_dse_info(	Line 64 root_dse_info(

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

e = (Entry *) ch_calloc( 1, sizeof(Entry) );	e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );

	if( e == NULL ) {
	#ifdef NEW_LOGGING
	LDAP_LOG( OPERATION, ERR,
	"root_dse_info: SLAP_CALLOC failed", 0, 0, 0 );
	#else
	Debug( LDAP_DEBUG_ANY,
	"root_dse_info: SLAP_CALLOC failed", 0, 0, 0 );
	#endif
	return LDAP_OTHER;
	}

e->e_attrs = NULL;	e->e_attrs = NULL;
e->e_name.bv_val = ch_strdup( LDAP_ROOT_DSE );	e->e_name.bv_val = ch_strdup( LDAP_ROOT_DSE );
Line 193 int read_root_dse_file( const char *fnam	Line 204 int read_root_dse_file( const char *fnam
return EXIT_FAILURE;	return EXIT_FAILURE;
}	}

usr_attr = (Entry *) ch_calloc( 1, sizeof(Entry) );	usr_attr = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
	if( usr_attr == NULL ) {
	#ifdef NEW_LOGGING
	LDAP_LOG( OPERATION, ERR,
	"read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );
	#else
	Debug( LDAP_DEBUG_ANY,
	"read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );
	#endif
	return LDAP_OTHER;
	}
usr_attr->e_attrs = NULL;	usr_attr->e_attrs = NULL;

while( ldif_read_record( fp, &lineno, &buf, &lmax ) ) {	while( ldif_read_record( fp, &lineno, &buf, &lmax ) ) {
Line 203 int read_root_dse_file( const char *fnam	Line 224 int read_root_dse_file( const char *fnam
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",
lineno );	lineno );
entry_free( e );
entry_free( usr_attr );	entry_free( usr_attr );
usr_attr = NULL;	usr_attr = NULL;
return EXIT_FAILURE;	return EXIT_FAILURE;

Removed from v.1.68
changed lines
	Added in v.1.70