From: Ronnie sahlberg <ronniesahlberg@gmail.com>
Date: Tue, 17 Apr 2007 00:15:44 +0000 (+1000)
Subject: change some error printouts to make it easier to determine whether the error occured... 
X-Git-Tag: tevent-0.9.20~348^2~2908^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee9712620f171381bb0d10ad8be490853eb0dc4a;p=thirdparty%2Fsamba.git

change some error printouts to make it easier to determine whether the error occured in the client or in the daemon

(This used to be ctdb commit a7e42c2c56e38b4b58ede0ad45767695d704dac4)
---

diff --git a/ctdb/common/ctdb_client.c b/ctdb/common/ctdb_client.c
index 3cb27a11650..5a335c0b946 100644
--- a/ctdb/common/ctdb_client.c
+++ b/ctdb/common/ctdb_client.c
@@ -114,23 +114,23 @@ static void ctdb_client_read_cb(uint8_t *data, size_t cnt, void *args)
 	struct ctdb_req_header *hdr;
 
 	if (cnt < sizeof(*hdr)) {
-		ctdb_set_error(ctdb, "Bad packet length %d\n", cnt);
+		ctdb_set_error(ctdb, "Bad packet length %d in client\n", cnt);
 		return;
 	}
 	hdr = (struct ctdb_req_header *)data;
 	if (cnt != hdr->length) {
-		ctdb_set_error(ctdb, "Bad header length %d expected %d\n", 
+		ctdb_set_error(ctdb, "Bad header length %d expected %d in client\n", 
 			       hdr->length, cnt);
 		return;
 	}
 
 	if (hdr->ctdb_magic != CTDB_MAGIC) {
-		ctdb_set_error(ctdb, "Non CTDB packet rejected\n");
+		ctdb_set_error(ctdb, "Non CTDB packet rejected in client\n");
 		return;
 	}
 
 	if (hdr->ctdb_version != CTDB_VERSION) {
-		ctdb_set_error(ctdb, "Bad CTDB version 0x%x rejected\n", hdr->ctdb_version);
+		ctdb_set_error(ctdb, "Bad CTDB version 0x%x rejected in client\n", hdr->ctdb_version);
 		return;
 	}
 
diff --git a/ctdb/common/ctdb_daemon.c b/ctdb/common/ctdb_daemon.c
index 945030d77e2..1a8c0f17c3a 100644
--- a/ctdb/common/ctdb_daemon.c
+++ b/ctdb/common/ctdb_daemon.c
@@ -85,7 +85,7 @@ static void daemon_message_handler(struct ctdb_context *ctdb, uint32_t srvid,
 	r->srvid         = srvid;
 	r->datalen       = data.dsize;
 	memcpy(&r->data[0], data.dptr, data.dsize);
-	
+
 	ctdb_queue_send(client->queue, (uint8_t *)&r->hdr, len);
 
 	talloc_free(r);
@@ -393,12 +393,12 @@ static void client_incoming_packet(struct ctdb_client *client, void *data, size_
 	struct ctdb_req_header *hdr = data;
 
 	if (hdr->ctdb_magic != CTDB_MAGIC) {
-		ctdb_set_error(client->ctdb, "Non CTDB packet rejected\n");
+		ctdb_set_error(client->ctdb, "Non CTDB packet rejected in daemon\n");
 		goto done;
 	}
 
 	if (hdr->ctdb_version != CTDB_VERSION) {
-		ctdb_set_error(client->ctdb, "Bad CTDB version 0x%x rejected\n", hdr->ctdb_version);
+		ctdb_set_error(client->ctdb, "Bad CTDB version 0x%x rejected in daemon\n", hdr->ctdb_version);
 		goto done;
 	}
 
@@ -444,12 +444,12 @@ static void ctdb_client_read_cb(uint8_t *data, size_t cnt, void *args)
 	}
 
 	if (cnt < sizeof(*hdr)) {
-		ctdb_set_error(client->ctdb, "Bad packet length %d\n", cnt);
+		ctdb_set_error(client->ctdb, "Bad packet length %d in daemon\n", cnt);
 		return;
 	}
 	hdr = (struct ctdb_req_header *)data;
 	if (cnt != hdr->length) {
-		ctdb_set_error(client->ctdb, "Bad header length %d expected %d\n", 
+		ctdb_set_error(client->ctdb, "Bad header length %d expected %d\n in daemon", 
 			       hdr->length, cnt);
 		return;
 	}
@@ -460,7 +460,7 @@ static void ctdb_client_read_cb(uint8_t *data, size_t cnt, void *args)
 	}
 
 	if (hdr->ctdb_version != CTDB_VERSION) {
-		ctdb_set_error(client->ctdb, "Bad CTDB version 0x%x rejected\n", hdr->ctdb_version);
+		ctdb_set_error(client->ctdb, "Bad CTDB version 0x%x rejected in daemon\n", hdr->ctdb_version);
 		return;
 	}