selftest: Remove secondary client interfaces

I can't see anything in the tests that ever tries to use these other IP
addresses. While it makes sense that we might want the tests to simulate
multiple different clients (with different IPs), we don't appear to do
this currently.

Removing the spare client addresses minimizes the number of hard-coded
IP addresses in selftest.

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

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 773b28439d4b771b56397b4b39456b5694322f97..37e288e456f813e06ffd61854730a3acec77a0e9 100755 (executable)
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -511,12 +511,7 @@ foreach (@opt_include) {
        push (@includes, read_test_regexes($_));
 }
 
-my $interfaces = join(',', ("127.0.0.11/8",
-                           "127.0.0.12/8",
-                           "127.0.0.13/8",
-                           "127.0.0.14/8",
-                           "127.0.0.15/8",
-                           "127.0.0.16/8"));
+my $interfaces = "127.0.0.11/8";
 
 my $clientdir = "$prefix_abs/client";
 

diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index 3a2386202a61129e51373b561d911c2b6f0eec06..2d8cbc28703e5dfc34e693b38f91b8db1dadb483 100644 (file)
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -437,9 +437,12 @@ sub get_interface($)
                localnt4dc9       => 9,
                # 10 is spare
 
-               # 11-16 used by selftest.pl for client interfaces
+               # 11 is used by selftest.pl for the client interface
                client            => 11,
 
+               # 12-16 have been historically reserved for the client, although
+               # aren't actually used
+
                addc_no_nss       => 17,
                addc_no_ntlm      => 18,
                idmapadmember     => 19,