git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
75347b8
)
Revert "when creating/adding a public ip, set the initial interface to be the first...
author
Amitay Isaacs
<amitay@gmail.com>
Thu, 20 Sep 2012 07:10:34 +0000
(17:10 +1000)
committer
Amitay Isaacs
<amitay@gmail.com>
Sun, 7 Oct 2012 04:25:34 +0000
(15:25 +1100)
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@gmail.com>
(This used to be ctdb commit
06dfd13604d08910e07cbf927c338d7b9fce9a2f
)
ctdb/server/ctdb_takeover.c
patch
|
blob
|
history
diff --git
a/ctdb/server/ctdb_takeover.c
b/ctdb/server/ctdb_takeover.c
index 40bf4bcdc415909fe1b7989ca9742cbb2a3e3165..775bb061d6ceb3c6d347020ad5e1b0209a1a5366 100644
(file)
--- a/
ctdb/server/ctdb_takeover.c
+++ b/
ctdb/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);