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.105 and 1.106

version 1.105, 2005/05/11 20:40:50	version 1.106, 2005/05/11 22:46:39
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.104 2005/05/04 22:22:43 ando Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.105 2005/05/11 20:40:50 kurt 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-2005 The OpenLDAP Foundation.	* Copyright 1999-2005 The OpenLDAP Foundation.
Line 234 root_dse_info(	Line 234 root_dse_info(
*/	*/
int read_root_dse_file( const char *fname )	int read_root_dse_file( const char *fname )
{	{
FILE *fp;	struct LDIFFP *fp;
int rc = 0, lineno = 0, lmax = 0;	int rc = 0, lineno = 0, lmax = 0;
char *buf = NULL;	char *buf = NULL;

if ( (fp = fopen( fname, "r" )) == NULL ) {	if ( (fp = ldif_open( 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",
fname, 0, 0 );	fname, 0, 0 );
Line 250 int read_root_dse_file( const char *fnam	Line 250 int read_root_dse_file( const char *fnam
if( usr_attr == NULL ) {	if( usr_attr == NULL ) {
Debug( LDAP_DEBUG_ANY,	Debug( LDAP_DEBUG_ANY,
"read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );	"read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );
fclose( fp );	ldif_close( fp );
return LDAP_OTHER;	return LDAP_OTHER;
}	}
usr_attr->e_attrs = NULL;	usr_attr->e_attrs = NULL;
Line 302 int read_root_dse_file( const char *fnam	Line 302 int read_root_dse_file( const char *fnam

ch_free( buf );	ch_free( buf );

fclose( fp );	ldif_close( fp );

Debug(LDAP_DEBUG_CONFIG, "rootDSE file %s read.\n", fname, 0, 0);	Debug(LDAP_DEBUG_CONFIG, "rootDSE file %s read.\n", fname, 0, 0);
return rc;	return rc;

Removed from v.1.105
changed lines
	Added in v.1.106