[SCM] CTDB repository - branch master updated - 29aaa339ef745208fb0b746db5cbc3a32d0d81b2

[Ronnie Sahlberg]

The branch, master has been updated
       via  29aaa339ef745208fb0b746db5cbc3a32d0d81b2 (commit)
       via  db6bc3745a56cc12e60e727190a098a6527690d6 (commit)
      from  3059ab5f3f21e331b80728773c36a74620e46677 (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 29aaa339ef745208fb0b746db5cbc3a32d0d81b2
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Aug 11 10:33:22 2008 +1000

    new version 1.0.55

-----------------------------------------------------------------------

Summary of changes:
 packaging/RPM/ctdb.spec |    4 +++-
 server/ctdb_takeover.c  |    7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index ea9ffbd..fedb26e 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -5,7 +5,7 @@ Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name: ctdb
 Version: 1.0
-Release: 54
+Release: 55
 Epoch: 0
 License: GNU GPL version 3
 Group: System Environment/Daemons
@@ -118,6 +118,8 @@ fi
 %{_includedir}/ctdb_private.h
 
 %changelog
+* Mon Aug 11 2008: Version 1.0.55
+ - Fix the releaseip message we seond to samba.
 * Fri Aug 8 2008 : Version 1.0.54
  - fix a looping error in the transaction code
  - provide a more detailed error code for persistent store errors
diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index 10369d4..53f48c1 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -304,13 +304,18 @@ static void release_ip_callback(struct ctdb_context *ctdb, int status,
 	/* send a message to all clients of this node telling them
 	   that the cluster has been reconfigured and they should
 	   release any sockets on this IP */
+#if 1
+	strncpy(ip, inet_ntoa(state->addr->ip.sin_addr), sizeof(ip)-1);
+#else
 	if (inet_ntop(state->addr->sa.sa_family, &state->addr->sa.sa_data[0], ip, sizeof(ip)) == NULL) {
 		DEBUG(DEBUG_ERR, (__location__ " inet_ntop() failed\n"));
 	}
-	
+#endif
 	data.dptr = (uint8_t *)ip;
 	data.dsize = strlen(ip)+1;
 
+	DEBUG(DEBUG_INFO,(__location__ " sending RELEASE_IP for '%s'\n", data.dptr));
+
 	ctdb_daemon_send_message(ctdb, ctdb->pnn, CTDB_SRVID_RELEASE_IP, data);
 
 	/* kill clients that have registered with this IP */


-- 
CTDB repository