Listener commit broke test048, skip listener check on Hidden DBs

[openldap] / servers / slurpd / replica.c

diff --git a/servers/slurpd/replica.c b/servers/slurpd/replica.c
index 58408ba663ae34b531762581e265fe1948b815cc..4702d105c7fd0d6d46b14c9e6d6c22e2efd3ff0d 100644 (file)
--- a/servers/slurpd/replica.c
+++ b/servers/slurpd/replica.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,25 +51,13 @@ replicate(
 {
     Ri         *ri = (Ri *) ri_arg;
 
-#ifdef NEW_LOGGING
-       LDAP_LOG ( SLURPD, ARGS, "replicate: "
-               "begin replication thread for %s:%d\n",
-           ((Ri *)ri)->ri_hostname, ((Ri *)ri)->ri_port, 0 );
-#else
     Debug( LDAP_DEBUG_ARGS, "begin replication thread for %s:%d\n",
-           ((Ri *)ri)->ri_hostname, ((Ri *)ri)->ri_port, 0 );
-#endif
+           ri->ri_hostname, ri->ri_port, 0 );
 
     ri->ri_process( ri );
 
-#ifdef NEW_LOGGING
-       LDAP_LOG ( SLURPD, ARGS, "replicate: "
-               "begin replication thread for %s:%d\n",
-           ri->ri_hostname, ri->ri_port, 0 );
-#else
     Debug( LDAP_DEBUG_ARGS, "end replication thread for %s:%d\n",
            ri->ri_hostname, ri->ri_port, 0 );
-#endif
     return NULL;
 }
 
@@ -86,14 +74,8 @@ start_replica_thread(
     /* POSIX_THREADS or compatible */
     if ( ldap_pvt_thread_create( &(ri->ri_tid), 0, replicate,
            (void *) ri ) != 0 ) {
-#ifdef NEW_LOGGING
-       LDAP_LOG ( SLURPD, ERR, "start_replica_thread: "
-               "replica %s:%d ldap_pvt_thread_create failed\n",
-           ri->ri_hostname, ri->ri_port, 0 );
-#else
        Debug( LDAP_DEBUG_ANY, "replica \"%s:%d\" ldap_pvt_thread_create failed\n",
                ri->ri_hostname, ri->ri_port, 0 );
-#endif
        return -1;
     }