X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslurpd%2Fri.c;h=a614c4e2f66ffc0d74536dd9a5c127463424cf00;hb=3868f3b5a7ebdbc098945df8401673905fa2e8a1;hp=a805060a98f0672683e25c0127854154cd7d09a5;hpb=4a8ab5dbf2ba037b0824d64bb3217ca06671884a;p=openldap

diff --git a/servers/slurpd/ri.c b/servers/slurpd/ri.c
index a805060a98..a614c4e2f6 100644
--- a/servers/slurpd/ri.c
+++ b/servers/slurpd/ri.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
@@ -53,9 +53,16 @@ Ri_process(
     char	*errmsg;
 
     (void) SIGNAL( LDAP_SIGUSR1, do_nothing );
+#ifdef SIGPIPE
     (void) SIGNAL( SIGPIPE, SIG_IGN );
+#endif
     if ( ri == NULL ) {
+#ifdef NEW_LOGGING
+	LDAP_LOG ( SLURPD, ERR, "Ri_process: "
+		"Error: ri == NULL!\n", 0, 0, 0 );
+#else
 	Debug( LDAP_DEBUG_ANY, "Error: Ri_process: ri == NULL!\n", 0, 0, 0 );
+#endif
 	return -1;
     }
 
@@ -85,22 +92,40 @@ Ri_process(
 	if ( re != NULL ) {
 	    if ( !ismine( ri, re )) {
 		/* The Re doesn't list my host:port */
+#ifdef NEW_LOGGING
+		LDAP_LOG ( SLURPD, DETAIL1, "Ri_process: "
+			"Replica %s:%d, skip repl record for %s (not mine)\n",
+			ri->ri_hostname, ri->ri_port, re->re_dn );
+#else
 		Debug( LDAP_DEBUG_TRACE,
 			"Replica %s:%d, skip repl record for %s (not mine)\n",
 			ri->ri_hostname, ri->ri_port, re->re_dn );
+#endif
 	    } else if ( !isnew( ri, re )) {
 		/* This Re is older than my saved status information */
+#ifdef NEW_LOGGING
+		LDAP_LOG ( SLURPD, DETAIL1, "Ri_process: "
+			"Replica %s:%d, skip repl record for %s (old)\n",
+			ri->ri_hostname, ri->ri_port, re->re_dn );
+#else
 		Debug( LDAP_DEBUG_TRACE,
 			"Replica %s:%d, skip repl record for %s (old)\n",
 			ri->ri_hostname, ri->ri_port, re->re_dn );
+#endif
 	    } else {
 		rc = do_ldap( ri, re, &errmsg );
 		switch ( rc ) {
 		case DO_LDAP_ERR_RETRYABLE:
 		    ldap_pvt_thread_sleep( RETRY_SLEEP_TIME );
+#ifdef NEW_LOGGING
+			LDAP_LOG ( SLURPD, DETAIL1, "Ri_process: "
+				"Retrying operation for DN %s on replica %s:%d\n",
+			    re->re_dn, ri->ri_hostname, ri->ri_port );
+#else
 		    Debug( LDAP_DEBUG_ANY,
 			    "Retrying operation for DN %s on replica %s:%d\n",
 			    re->re_dn, ri->ri_hostname, ri->ri_port );
+#endif
 		    continue;
 		    break;
 		case DO_LDAP_ERR_FATAL: {
@@ -122,8 +147,13 @@ Ri_process(
 		}
 	    }
 	} else {
+#ifdef NEW_LOGGING
+		LDAP_LOG ( SLURPD, ERR, "Ri_process: "
+			"Error: re is null in Ri_process\n", 0, 0, 0 );
+#else
 	    Debug( LDAP_DEBUG_ANY, "Error: re is null in Ri_process\n",
 		    0, 0, 0 );
+#endif
 	}
 	rq->rq_lock( rq );
 	while ( !sglob->slurpd_shutdown &&
@@ -182,6 +212,7 @@ Ri_init(
 
     /* Initialize private data */
     (*ri)->ri_hostname = NULL;
+    (*ri)->ri_uri = NULL;
     (*ri)->ri_ldp = NULL;
     (*ri)->ri_bind_dn = NULL;
     (*ri)->ri_password = NULL;