From: Martin Schwenke <martin@meltin.net>
Date: Thu, 22 Feb 2018 07:48:23 +0000 (+1100)
Subject: ctdb-scripts: Add default for public addresses file where missing
X-Git-Tag: talloc-2.1.12~327
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c8dfd4fe5a5ef8a368406d2afef58cbf8f162ca5;p=thirdparty%2Fsamba.git

ctdb-scripts: Add default for public addresses file where missing

This makes it consistent with the rest of the script code.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/config/events.d/13.per_ip_routing b/ctdb/config/events.d/13.per_ip_routing
index d8e02475dff..191d947264d 100755
--- a/ctdb/config/events.d/13.per_ip_routing
+++ b/ctdb/config/events.d/13.per_ip_routing
@@ -207,7 +207,7 @@ get_config_for_ip ()
 	    if [ "$_ip" = "$_i" ] ; then
 		printf "%s" "$_ip "; ipv4_host_addr_to_net "$_ip" "$_maskbits"
 	    fi
-	done <"${CTDB_PUBLIC_ADDRESSES:-/dev/null}"
+	done <"${CTDB_PUBLIC_ADDRESSES:-${CTDB_BASE}/public_addresses}"
     else
 	while read _i _rest ; do
 	    if [ "$_ip" = "$_i" ] ; then
diff --git a/ctdb/config/functions b/ctdb/config/functions
index 3805d480326..68149c6399e 100755
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -592,7 +592,7 @@ drop_all_public_ips ()
 	# shellcheck disable=SC2034
 	while read _ip _x ; do
 		drop_ip "$_ip"
-	done <"${CTDB_PUBLIC_ADDRESSES:-/dev/null}"
+	done <"${CTDB_PUBLIC_ADDRESSES:-${CTDB_BASE}/public_addresses}"
 }
 
 flush_route_cache ()