10 files changed, 4 insertions, 16 deletions
diff --git a/ctdb/server/ctdb_tunables.c b/ctdb/server/ctdb_tunables.c
index bd7834daad..9da3cc8065 100644
--- a/ctdb/server/ctdb_tunables.c
+++ b/ctdb/server/ctdb_tunables.c
@@ -45,8 +45,8 @@ static const struct {
 	{ "DatabaseMaxDead",      5,  offsetof(struct ctdb_tunable, database_max_dead) },
 	{ "RerecoveryTimeout",   10,  offsetof(struct ctdb_tunable, rerecovery_timeout) },
 	{ "EnableBans",           1,  offsetof(struct ctdb_tunable, enable_bans) },
-	{ "DeterministicIPs",     1,  offsetof(struct ctdb_tunable, deterministic_public_ips) },
-	{ "LCP2PublicIPs",        0,  offsetof(struct ctdb_tunable, lcp2_public_ip_assignment) },
+	{ "DeterministicIPs",     0,  offsetof(struct ctdb_tunable, deterministic_public_ips) },
+	{ "LCP2PublicIPs",        1,  offsetof(struct ctdb_tunable, lcp2_public_ip_assignment) },
 	{ "ReclockPingPeriod",   60,  offsetof(struct ctdb_tunable,  reclock_ping_period) },
 	{ "NoIPFailback",         0,  offsetof(struct ctdb_tunable, no_ip_failback) },
 	{ "DisableIPFailover",    0,  offsetof(struct ctdb_tunable, disable_ip_failover) },
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.001.sh b/ctdb/tests/eventscripts/simple/50.samba.monitor.001.sh
index 77fc2eb852..77fc2eb852 100644..100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.001.sh
+++ b/ctdb/tests/eventscripts/simple/50.samba.monitor.001.sh
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.050.sh b/ctdb/tests/eventscripts/simple/50.samba.monitor.050.sh
index 7a1b422bd2..7a1b422bd2 100644..100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.050.sh
+++ b/ctdb/tests/eventscripts/simple/50.samba.monitor.050.sh
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.051.sh b/ctdb/tests/eventscripts/simple/50.samba.monitor.051.sh
index 3a53ac8aaa..3a53ac8aaa 100644..100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.051.sh
+++ b/ctdb/tests/eventscripts/simple/50.samba.monitor.051.sh
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.101.sh b/ctdb/tests/eventscripts/simple/50.samba.monitor.101.sh
index d4b80bbf8f..d4b80bbf8f 100644..100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.101.sh
+++ b/ctdb/tests/eventscripts/simple/50.samba.monitor.101.sh
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.102.sh b/ctdb/tests/eventscripts/simple/50.samba.monitor.102.sh
index 2f1f446fe8..2f1f446fe8 100644..100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.102.sh
+++ b/ctdb/tests/eventscripts/simple/50.samba.monitor.102.sh
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.103.sh b/ctdb/tests/eventscripts/simple/50.samba.monitor.103.sh
index 924d953ff4..8854780cad 100644..100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.103.sh
+++ b/ctdb/tests/eventscripts/simple/50.samba.monitor.103.sh
@@ -7,12 +7,6 @@ define_test "port 445 down"
 setup_samba
 tcp_port_down 445
 
-required_result 1 <<EOF
-ERROR: samba tcp port 445 is not responding
-netstat -l -t -n shows this output:
-Active Internet connections (servers only)
-Proto Recv-Q Send-Q Local Address           Foreign Address         State
-tcp        0      0 0.0.0.0:139             0.0.0.0:*               LISTEN
-EOF
+required_result 1 "ERROR: samba tcp port 445 is not responding"
 
 simple_test
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.104.sh b/ctdb/tests/eventscripts/simple/50.samba.monitor.104.sh
index c05b8d45f6..a29e7838b3 100644..100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.104.sh
+++ b/ctdb/tests/eventscripts/simple/50.samba.monitor.104.sh
@@ -7,12 +7,6 @@ define_test "port 139 down"
 setup_samba
 tcp_port_down 139
 
-required_result 1 <<EOF
-ERROR: samba tcp port 139 is not responding
-netstat -l -t -n shows this output:
-Active Internet connections (servers only)
-Proto Recv-Q Send-Q Local Address           Foreign Address         State
-tcp        0      0 0.0.0.0:445             0.0.0.0:*               LISTEN
-EOF
+required_result 1 "ERROR: samba tcp port 139 is not responding"
 
 simple_test
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.105.sh b/ctdb/tests/eventscripts/simple/50.samba.monitor.105.sh
index 624c4a502c..624c4a502c 100644..100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.105.sh
+++ b/ctdb/tests/eventscripts/simple/50.samba.monitor.105.sh
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.106.sh b/ctdb/tests/eventscripts/simple/50.samba.monitor.106.sh
index f54cc06c68..f54cc06c68 100644..100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.106.sh
+++ b/ctdb/tests/eventscripts/simple/50.samba.monitor.106.sh