Rev 586: merge from ronnie in http://samba.org/~tridge/ctdb

tridge at samba.org tridge at samba.org
Fri Jul 20 08:09:36 GMT 2007


------------------------------------------------------------
revno: 586
revision-id: tridge at samba.org-20070720080935-yxi1l90oqx2t50y7
parent: tridge at samba.org-20070720061909-w5shq3hzc49bf4yp
parent: sahlberg at ronnie-20070720070408-2p5yo9bxzkjubrd1
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge.test
timestamp: Fri 2007-07-20 18:09:35 +1000
message:
  merge from ronnie
modified:
  server/ctdb_takeover.c         ctdb_takeover.c-20070525071636-a5n1ihghjtppy08r-2
    ------------------------------------------------------------
    revno: 432.1.156
    merged: sahlberg at ronnie-20070720070408-2p5yo9bxzkjubrd1
    parent: sahlberg at ronnie-20070720050555-vwnvjwk88oqfdvxl
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Fri 2007-07-20 17:04:08 +1000
    message:
      when a client connects with TCP_CLIENT  we should look at the 
      destination address to find the public address   not the source address
=== modified file 'server/ctdb_takeover.c'
--- a/server/ctdb_takeover.c	2007-07-20 06:05:08 +0000
+++ b/server/ctdb_takeover.c	2007-07-20 08:09:35 +0000
@@ -648,7 +648,7 @@
 	tcp = talloc(client, struct ctdb_tcp_list);
 	CTDB_NO_MEMORY(ctdb, tcp);
 
-	addr = inet_ntoa(p->src.sin_addr);
+	addr = inet_ntoa(p->dest.sin_addr);
 
 	takeover_vnn = find_public_ip_vnn(ctdb, addr);
 	if (takeover_vnn == -1) {



More information about the samba-cvs mailing list