SQUASH Samba3

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 85168970349a864b34537237afd08fce9d4ef9f4..ba24b26e4f8af43ac1fb56abd3180e5d07dcddd2 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -243,13 +243,13 @@ sub setup_member($$$)
 sub setup_clusteredmember($$$$)
 {
        my ($self, $prefix, $s3dcvars) = @_;
-       my $public_if = 8;
+       my $swiface = 8;
 
-       print "PROVISIONING CLUSTERMEMBER8...";
+       print "PROVISIONING CLUSTEREDMEMBER...";
 
        my $ctdbprefix = "$prefix/ctdb";
 
-       my $ctdb_vars = $self->setup_ctdb($ctdbprefix, $public_if);
+       my $ctdb_vars = $self->setup_ctdb($ctdbprefix, $swiface);
 
        $ctdb_vars or return undef;
 
@@ -260,8 +260,8 @@ sub setup_clusteredmember($$$$)
        ctdbd socket = $ctdb_vars->{SOCKET_FILE}
 ";
        my $ret = $self->provision($prefix,
-                                  "CLUSTERMEMBER8",
-                                  $public_if,
+                                  "CLUSTEREDMEMBER",
+                                  $swiface,
                                   "clustermember8pass",
                                   $member_options);
 
@@ -1146,7 +1146,9 @@ domusers:X:$gid_domusers:
        $ENV{NSS_WRAPPER_PASSWD} = $nss_wrapper_passwd;
        $ENV{NSS_WRAPPER_GROUP} = $nss_wrapper_group;
 
-        my $cmd = Samba::bindir_path($self, "smbpasswd")." -c $conffile -L -s -a $unix_name > /dev/null";
+        my $cmd = "";
+       $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$swiface\" ";
+       $cmd .= Samba::bindir_path($self, "smbpasswd")." -c $conffile -L -s -a $unix_name > /dev/null";
        unless (open(PWD, "|$cmd")) {
              warn("Unable to set password for test account\n$cmd");
              return undef;
@@ -1257,10 +1259,6 @@ sub setup_ctdb($$)
                return undef;
        }
 
-       # TODO $vars->... ?
-
-#      $self->{vars}->{ctdb} = $vars;
-
        return $vars;
 }
 
@@ -1421,7 +1419,7 @@ sub wait_for_start_ctdb($$)
 
        print "wait for ctdbd\n";
 
-       print `ps axf | grep ctdbd`;
+       #print `ps axf | grep ctdbd`;
 
        sleep(3);