[SCM] CTDB repository - branch master updated - ctdb-1.13-276-gc4f5a58

[Amitay Isaacs]

The branch, master has been updated
       via  c4f5a58471b206e2287c7958c7f29c1f1c0626ac (commit)
       via  06dfd13604d08910e07cbf927c338d7b9fce9a2f (commit)
      from  212298279557a2833ef0f81809b4a5cdac72ca02 (commit)

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


- Log -----------------------------------------------------------------
commit c4f5a58471b206e2287c7958c7f29c1f1c0626ac
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Oct 9 11:39:58 2012 +0200

    Correct include for ctdb_protocol.h
    
    With an old ctdb_protocol.h installed under /usr/local, ctdb will
    not compile because the <> form of include will find the header
    under /usr/local

commit 06dfd13604d08910e07cbf927c338d7b9fce9a2f
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Thu Sep 20 17:10:34 2012 +1000

    Revert "when creating/adding a public ip, set the initial interface to be the first interface specified"
    
    This reverts commit 4308935ba48ac7a29e7523315acf580019715f0f.
    
    This fixes 16_ctdb_config_add_ip.sh test when run against local daemons. When
    running against local daemons, if the interface is assigned as soon as an IP is
    added, then takeover would never assign this IP address.
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>

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

Summary of changes:
 include/ctdb_client.h  |    2 +-
 server/ctdb_takeover.c |    3 ---
 2 files changed, 1 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/include/ctdb_client.h b/include/ctdb_client.h
index c14a395..9f0589f 100644
--- a/include/ctdb_client.h
+++ b/include/ctdb_client.h
@@ -19,7 +19,7 @@
 
 #ifndef _CTDB_CLIENT_H
 #define _CTDB_CLIENT_H
-#include <ctdb_protocol.h>
+#include "ctdb_protocol.h"
 
 enum control_state {CTDB_CONTROL_WAIT, CTDB_CONTROL_DONE, CTDB_CONTROL_ERROR, CTDB_CONTROL_TIMEOUT};
 
diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index 40bf4bc..775bb06 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -956,9 +956,6 @@ static int ctdb_add_public_address(struct ctdb_context *ctdb,
 			talloc_free(vnn);
 			return -1;
 		}
-		if (i == 0) {
-			vnn->iface = ctdb_find_iface(ctdb, vnn->ifaces[i]);
-		}
 	}
 
 	DLIST_ADD(ctdb->vnn, vnn);


-- 
CTDB repository