From 790ceec78bc4f1b5234d8f90eb4bfaa11c2f7d4b Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 18 Apr 2011 18:57:22 +1000
Subject: s4-selftest Rename Samba4 'member' test environment to s4member

This will avoid a conflict with the s3 'member' environment.

Andrew Bartlett
---
 selftest/target/Samba4.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'selftest/target')

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 9b8e3b98d0..dd7daf736d 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -878,7 +878,7 @@ sub provision_member($$$)
 
 	my $ret = $self->provision($prefix,
 				   "member server",
-				   "localmember",
+				   "s4member",
 				   "SAMBADOMAIN",
 				   "samba.example.com",
 				   "2008",
@@ -1294,11 +1294,11 @@ sub setup_env($$$)
 			$self->setup_dc("$path/dc");
 		}
 		return $self->setup_vampire_dc("$path/vampire_dc", $self->{vars}->{dc});
-	} elsif ($envname eq "member") {
+	} elsif ($envname eq "s4member") {
 		if (not defined($self->{vars}->{dc})) {
 			$self->setup_dc("$path/dc");
 		}
-		return $self->setup_member("$path/member", $self->{vars}->{dc});
+		return $self->setup_member("$path/s4member", $self->{vars}->{dc});
 	} elsif ($envname eq "rodc") {
 		if (not defined($self->{vars}->{dc})) {
 			$self->setup_dc("$path/dc");
@@ -1309,7 +1309,7 @@ sub setup_env($$$)
 			$ENV{ENVNAME} = "dc";
 			$self->setup_dc("$path/dc");
 		}
-		my $ret = $self->setup_member("$path/member", $self->{vars}->{dc});
+		my $ret = $self->setup_member("$path/s4member", $self->{vars}->{dc});
 		if (not defined($self->{vars}->{rpc_proxy})) {
 			$ENV{ENVNAME} = "rpc_proxy";
 			my $rpc_proxy_ret = $self->setup_rpc_proxy("$path/rpc_proxy", $self->{vars}->{dc});
-- 
cgit