[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fedora-directory-commits
Subject:    [389-commits] Branch '389-ds-base-1.2.11' - ldap/servers
From:       Richard Allen Megginson <rmeggins () fedoraproject ! org>
Date:       2012-09-14 20:00:19
Message-ID: 20120914200019.70C8DA2E39 () fedorahosted ! org
[Download RAW message or body]

 ldap/servers/plugins/replication/repl_extop.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 0b79915854da26aae0d17f509f168290926cf14f
Author: Rich Megginson <rmeggins@redhat.com>
Date:   Fri Sep 14 13:57:22 2012 -0600

    fix compiler warnings in ticket 374 code
    (cherry picked from commit 1f775d7339cdabde70e73ce0be2e4432b16ba1a3)

diff --git a/ldap/servers/plugins/replication/repl_extop.c \
b/ldap/servers/plugins/replication/repl_extop.c index ca8fc55..645e749 100644
--- a/ldap/servers/plugins/replication/repl_extop.c
+++ b/ldap/servers/plugins/replication/repl_extop.c
@@ -46,7 +46,10 @@
 #include "repl5.h"
 #include "repl5_prot_private.h"
 #include "cl5_api.h"
-
+#define ENABLE_TEST_TICKET_374
+#ifdef ENABLE_TEST_TICKET_374
+#include <unistd.h> /* for usleep */
+#endif
 
 /*
  * repl_extop.c - there are two types of functions in this file:
@@ -902,13 +905,12 @@ multimaster_extop_StartNSDS50ReplicationRequest(Slapi_PBlock \
*pb)  }
 
 	/* remove this code once ticket 374 is fixed */
-#define ENABLE_TEST_TICKET_374
 #ifdef ENABLE_TEST_TICKET_374
 	if (getenv("SLAPD_TEST_TICKET_374") && (opid > 20)) {
 		int i = 0;
 		int max = 480 * 5;
 		slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
-						"conn=%d op=%d repl=\"%s\": "
+						"conn=%" NSPRIu64 " op=%d repl=\"%s\": "
 						"374 - Starting sleep: connext->repl_protocol_version == %d\n",
 						connid, opid, repl_root, connext->repl_protocol_version);
         
@@ -917,7 +919,7 @@ multimaster_extop_StartNSDS50ReplicationRequest(Slapi_PBlock *pb)
 		}
         
 		slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
-						"conn=%d op=%d repl=\"%s\": "
+						"conn=%" NSPRIu64 " op=%d repl=\"%s\": "
 						"374 - Finished sleep: connext->repl_protocol_version == %d\n",
 						connid, opid, repl_root, connext->repl_protocol_version);
 	}


--
389 commits mailing list
389-commits@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/389-commits


[prev in list] [next in list] [prev in thread] [next in thread]