selftest: add "member" environment for Samba3

metze

2 files changed, 49 insertions, 1 deletions

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index dc754efa177..97cf6971790 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -457,7 +457,7 @@ if ($opt_target eq "samba4") {
 	if ($opt_socket_wrapper and `$bindir/smbd -b | grep SOCKET_WRAPPER` eq "") {
 		die("You must include --enable-socket-wrapper when compiling Samba in order to execute 'make test'.  Exiting....");
 	}
-	$testenv_default = "dc";
+	$testenv_default = "member";
 	require target::Samba3;
 	$target = new Samba3($bindir);
 } elsif ($opt_target eq "win") {
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 2b2f6a51b57..bb074b7b6e2 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -95,6 +95,11 @@ sub setup_env($$$)
 	
 	if ($envname eq "dc") {
 		return $self->setup_dc("$path/dc");
+	} elsif ($envname eq "member") {
+		if (not defined($self->{vars}->{dc})) {
+			$self->setup_dc("$path/dc");
+		}
+		return $self->setup_member("$path/member", $self->{vars}->{dc});
 	} else {
 		return undef;
 	}
@@ -124,9 +129,52 @@ sub setup_dc($$)
 
 	$self->wait_for_start($vars);
 
+	$self->{vars}->{dc} = $vars;
+
 	return $vars;
 }
 
+sub setup_member($$$)
+{
+	my ($self, $prefix, $dcvars) = @_;
+
+	print "PROVISIONING MEMBER...";
+
+	my $member_options = "
+	security = domain
+";
+	my $ret = $self->provision($prefix,
+				   "LOCALMEMBER3",
+				   3,
+				   "localmember3pass",
+				   $member_options);
+
+	$ret or die("Unable to provision");
+
+	my $net = $self->binpath("net");
+	my $cmd = "";
+	$cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
+	$cmd .= "$net join $ret->{CONFIGURATION} $dcvars->{DOMAIN} member";
+	$cmd .= " -U$dcvars->{USERNAME}\%$dcvars->{PASSWORD}";
+
+	system($cmd) == 0 or die("Join failed\n$cmd");
+
+	$self->check_or_start($ret,
+			      ($ENV{NMBD_MAXTIME} or 2700),
+			      ($ENV{WINBINDD_MAXTIME} or 2700),
+			      ($ENV{SMBD_MAXTIME} or 2700));
+
+	$self->wait_for_start($ret);
+
+	$ret->{DC_SERVER} = $dcvars->{SERVER};
+	$ret->{DC_SERVER_IP} = $dcvars->{SERVER_IP};
+	$ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME};
+	$ret->{DC_USERNAME} = $dcvars->{USERNAME};
+	$ret->{DC_PASSWORD} = $dcvars->{PASSWORD};
+
+	return $ret;
+}
+
 sub stop($)
 {
 	my ($self) = @_;