selftest:Samba3: remove useless 'member' argument and use 'net ads join'

The net_ads_join code path tries to join a domain called 'MEMBER'
and only the fallback to net_rpc_join lets this work at all.

The net_rpc_join code path tries to convert the argument
to a join type.

So use a command real admins will use.

I noticed this as I was wondering about the message:

 ADS join did not work, falling back to RPC...

on the screen when starting the 'clusteredmember'
environment.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 773fc96af14556cadc8aa1343a771f3b8e257b51..b99708df1a2688b373a2fb97d9237c2f68ff0d14 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -664,7 +664,7 @@ sub setup_clusteredmember
        $cmd .= "RESOLV_CONF=\"$ret->{RESOLV_CONF}\" ";
        $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
        $cmd .= "SELFTEST_WINBINDD_SOCKET_DIR=\"$ret->{SELFTEST_WINBINDD_SOCKET_DIR}\" ";
-       $cmd .= "$net join $ret->{CONFIGURATION} $dcvars->{DOMAIN} member";
+       $cmd .= "$net ads join $ret->{CONFIGURATION} $dcvars->{DOMAIN}";
        $cmd .= " -U$dcvars->{USERNAME}\%$dcvars->{PASSWORD}";
 
        if (system($cmd) != 0) {