diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-06-18 15:02:05 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2013-06-20 13:01:10 +1000 |
| commit | 4eed91b54a2c374a06c2275cbd8d4a50abbe9cdd (patch) | |
| tree | 23af3dc38422cda255018916ca06ffdb4e320596 | |
| parent | 2ceed3b0c817b4ed86363c7e0eef94d7cb33a5a2 (diff) | |
| download | samba-4eed91b54a2c374a06c2275cbd8d4a50abbe9cdd.tar.gz samba-4eed91b54a2c374a06c2275cbd8d4a50abbe9cdd.tar.xz samba-4eed91b54a2c374a06c2275cbd8d4a50abbe9cdd.zip | |
eventscripts: 13.per_ip_routing should not try hard to find public_addresses
This essentially reverts d4621277240721e6d130a930b0100506b64467ea.
This was added for testing but the test code was actually broken.
CTDB itself will only process public IPs if $CTDB_PUBLIC_ADDRESSES is
set, so no code should try to be more flexible than that!
The test code has been fixed instead.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 3b11b27f3e22e99947bc2d6c49c4427bd7a0e332)
| -rwxr-xr-x | ctdb/config/events.d/13.per_ip_routing | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ctdb/config/events.d/13.per_ip_routing b/ctdb/config/events.d/13.per_ip_routing index 4b13546d274..de153a6db19 100755 --- a/ctdb/config/events.d/13.per_ip_routing +++ b/ctdb/config/events.d/13.per_ip_routing @@ -191,7 +191,7 @@ get_config_for_ip () if [ "$_ip" = "$_i" ] ; then echo -n "$_ip "; ipv4_host_addr_to_net "$_ip" "$_maskbits" fi - done <"${CTDB_PUBLIC_ADDRESSES:-${CTDB_BASE:-/dev/null}${CTDB_BASE:+/public_addresses}}" + done <"${CTDB_PUBLIC_ADDRESSES:-/dev/null}" else while read _i _rest ; do if [ "$_ip" = "$_i" ] ; then |