From: Tim Beale <timbeale@catalyst.net.nz>
Date: Wed, 13 Feb 2019 01:21:16 +0000 (+1300)
Subject: selftest: dns_hub doesn't need to store $swiface
X-Git-Tag: talloc-2.2.0~172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=572f83d62a5853634dfa79669393a70d9ce20731;p=thirdparty%2Fsamba.git

selftest: dns_hub doesn't need to store $swiface

dns_hub doesn't need to store $ctx->{swiface}. Other testenvs store this
and export it as SOCKET_WRAPPER_DEFAULT_IFACE (i.e. for the tests to
use), but dns_hub doesn't need to do this.

Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index bbe3ece9fc8..84b7fa9dc03 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -385,14 +385,11 @@ sub setup_dns_hub_internal($$$)
 		warn("Unable to clean up");
 	}
 
-	my $swiface = Samba::get_interface($hostname);
-
 	my $env = undef;
 	$env->{prefix} = $prefix;
 	$env->{prefix_abs} = $prefix_abs;
 
 	$env->{hostname} = $hostname;
-	$env->{swiface} = $swiface;
 
 	$env->{ipv4} = Samba::get_ipv4_addr($hostname);
 	$env->{ipv6} = Samba::get_ipv6_addr($hostname);
@@ -420,6 +417,7 @@ sub setup_dns_hub_internal($$$)
 		open STDOUT, "| tee $env->{DNS_HUB_LOG} 1>&2";
 		open STDERR, '>&STDOUT';
 
+		my $swiface = Samba::get_interface($hostname);
 		SocketWrapper::set_default_iface($swiface);
 		my $pcap_file = "$ENV{SOCKET_WRAPPER_PCAP_DIR}/env-$hostname$.pcap";
 		SocketWrapper::setup_pcap($pcap_file);