/* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
*/
-/*
- * Copyright (c) 1996 Regents of the University of Michigan.
+/* Portions Copyright (c) 1996 Regents of the University of Michigan.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
* software without specific prior written permission. This software
* is provided ``as is'' without express or implied warranty.
*/
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).
+ */
/*
* re.c - routines which deal with Re (Replication entry) structures.
#include <stdio.h>
+#include <ac/stdlib.h>
#include <ac/errno.h>
#include <ac/socket.h>
#include <ac/string.h>
#include <ac/ctype.h>
+#include "../slapd/slap.h"
+
#include "slurp.h"
#include "globals.h"
-#include "../slapd/slap.h"
-
/* Forward references */
static Rh *get_repl_hosts LDAP_P(( char *, int *, char ** ));
static int gettype LDAP_P(( char * ));
return 0;
}
if ( re->re_refcnt > 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( SLURPD, WARNING, "Re_free: "
+ "Warning: freeing re (dn: %s) with nonzero refcnt\n", re->re_dn, 0, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"Warning: freeing re (dn: %s) with nonzero refcnt\n",
re->re_dn, 0, 0 );
+#endif
}
ldap_pvt_thread_mutex_destroy( &re->re_mutex );
int nreplicas;
if ( re == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( SLURPD, ERR, "Re_parse: Error: re is NULL\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_ANY, "Re_parse: error: re is NULL\n", 0, 0, 0 );
+#endif
return -1;
}
if ( replbuf == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( SLURPD, ERR, "Re_parse: Error: replbuf is NULL\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_ANY, "Re_parse: error: replbuf is NULL\n", 0, 0, 0 );
+#endif
return -1;
}
}
buflen = strlen( buf );
if ( ldif_parse_line( buf, &type, &value, &len ) < 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( SLURPD, ERR,
+ "Re_parse: Error: malformed replog file\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"Error: Re_parse: malformed replog file\n",
0, 0, 0 );
+#endif
return -1;
}
switch ( gettype( type )) {
break;
default:
if ( !( state == GOT_ALL )) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( SLURPD, ERR,
+ "Re_parse: Error: bad type <%s>\n", type, 0, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"Error: Re_parse: bad type <%s>\n",
type, 0, 0 );
+#endif
free( type );
- if ( value != NULL )
- free( value );
+ free( value );
return -1;
}
}
free( type );
- if ( value != NULL )
- free( value );
+ free( value );
}
if ( state != GOT_ALL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( SLURPD, ERR,
+ "Re_parse: Error: malformed replog file\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"Error: Re_parse: malformed replog file\n",
0, 0, 0 );
+#endif
return -1;
}
value = NULL;
} else {
if ( ldif_parse_line( buf, &type, &value, &len ) < 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( SLURPD, ERR,
+ "Re_parse: Error: malformed replog line \"%s\"\n", buf, 0, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"Error: malformed replog line \"%s\"\n",
buf, 0, 0 );
+#endif
return -1;
}
}
free( type );
if ( !repl_ok ) {
warn_unknown_replica( value, port );
- if ( value != NULL )
- free( value );
+ free( value );
continue;
}
rh = (Rh *) ch_realloc((char *) rh, ( nreplicas + 2 ) * sizeof( Rh ));
if ( rh == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( SLURPD, ERR,
+ "get_repl_hosts: Out of memory\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_ANY, "Out of memory in get_repl_hosts\n",
0, 0, 0 );
+#endif
return NULL;
}
rh[ nreplicas ].rh_hostname = strdup( value );
rh[ nreplicas ].rh_port = port;
nreplicas++;
- if ( value != NULL )
- free( value );
+ free( value );
}
if ( nreplicas == 0 ) {
Mi *mi;
if ( re == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( SLURPD, ERR, "Re_dump: re is NULL\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_TRACE, "Re_dump: re is NULL\n", 0, 0, 0 );
+#endif
return;
}
fprintf( fp, "Re_dump: ******\n" );
int rc = 0;
if ( re == NULL || fp == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( SLURPD, ERR,
+ "Re_write: Internal error: NULL argument\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_ANY, "Internal error: Re_write: NULL argument\n",
0, 0, 0 );
+#endif
return -1;
}
goto bad;
}
} else { /* write multiple "replica:" lines */
- for ( i = 0; re->re_replicas[ i ].rh_hostname != NULL; i++ ) {
+ for ( i = 0; re->re_replicas && re->re_replicas[ i ].rh_hostname != NULL; i++ ) {
if ( fprintf( fp, "replica: %s:%d\n",
re->re_replicas[ i ].rh_hostname,
re->re_replicas[ i ].rh_port ) < 0 ) {
}
bad:
if ( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( SLURPD, ERR,
+ "Re_write: Error while writing: %s\n", sys_errlist[ errno ], 0, 0 );
+#else
Debug( LDAP_DEBUG_ANY, "Error while writing: %s\n",
sys_errlist[ errno ], 0, 0 );
+#endif
}
return rc;
}
}
}
if ( !found ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( SLURPD, WARNING, "warn_unknown_replica: "
+ "Warning: unknown replica %s:%d found in replication log\n",
+ host, port, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"Warning: unknown replica %s:%d found in replication log\n",
host, port, 0 );
+#endif
nur++;
ur = (Rh *) ch_realloc( (char *) ur, ( nur * sizeof( Rh )));
ur[ nur - 1 ].rh_hostname = strdup( host );
projects / openldap / blobdiff