[SCM] CTDB repository - branch master updated - ctdb-1.0.114-67-g480af69

[Ronnie Sahlberg]

The branch, master has been updated
       via  480af69b63b9162c85d8e04461ca9e4a083c04a4 (commit)
      from  35d9ac7d162f99795ac3146fcd464e9d2e45feaa (commit)

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


- Log -----------------------------------------------------------------
commit 480af69b63b9162c85d8e04461ca9e4a083c04a4
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Apr 28 08:46:41 2010 +1000

    If the admin makes a configuration mistake and configures NATGW to use the
    same ip address as a normal public-address,
    check for this in the natgw script and warn the user.
    
    Also prevent ctdb from starting up since this configuration will not work.
    
    BZ60933

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

Summary of changes:
 config/events.d/11.natgw |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/11.natgw b/config/events.d/11.natgw
index b226b81..e6e54f4 100644
--- a/config/events.d/11.natgw
+++ b/config/events.d/11.natgw
@@ -27,6 +27,15 @@ delete_all() {
 
 case "$1" in 
     startup)
+	[ -z "$CTDB_PUBLIC_ADDRESSES" ] && {
+		CTDB_PUBLIC_ADDRESSES=/etc/ctdb/public_addresses
+	}
+	egrep "^$CTDB_NATGW_PUBLIC_IP[ \t]" $CTDB_PUBLIC_ADDRESSES >/dev/null
+	[ "$?" = "0" ] && {
+		echo ERROR: NATGW configured to use a public address. NATGW must not use a public address.
+		exit 1
+	}
+
 	# do not respond to ARPs that are for ip addresses with scope 'host'
 	echo 3 > /proc/sys/net/ipv4/conf/all/arp_ignore
 	# do not send out arp requests from loopback addresses


-- 
CTDB repository