diff options
| author | Michael Adam <obnox@samba.org> | 2015-03-06 09:39:54 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2015-03-16 23:04:47 +0100 |
| commit | 0607148154114c56aa4a54daeedbd865e7823062 (patch) | |
| tree | 451b29aecc8989af2ed85e9a8b5e816294a5be7b /selftest | |
| parent | c157baa4b9b62d22004408d3dd2cc860c32e9771 (diff) | |
| download | samba-0607148154114c56aa4a54daeedbd865e7823062.tar.gz | |
selftest: rename env s3dc_schannel to nt4_dc_schannel
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'selftest')
| -rw-r--r-- | selftest/target/Samba.pm | 2 | ||||
| -rwxr-xr-x | selftest/target/Samba3.pm | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm index 524c2ef4b3d..e59708dad97 100644 --- a/selftest/target/Samba.pm +++ b/selftest/target/Samba.pm @@ -164,7 +164,7 @@ sub get_interface($) $interfaces{"localktest6"} = 7; $interfaces{"maptoguest"} = 8; - $interfaces{"locals3dc9"} = 9; + $interfaces{"localnt4dc9"} = 9; # 11-16 used by selftest.pl for client interfaces diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 23d00aa97eb..adf833b6842 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -175,8 +175,8 @@ sub setup_env($$$) if ($envname eq "nt4_dc") { return $self->setup_nt4_dc("$path/nt4_dc"); - } elsif ($envname eq "s3dc_schannel") { - return $self->setup_s3dc_schannel("$path/s3dc_schannel"); + } elsif ($envname eq "nt4_dc_schannel") { + return $self->setup_nt4_dc_schannel("$path/nt4_dc_schannel"); } elsif ($envname eq "simpleserver") { return $self->setup_simpleserver("$path/simpleserver"); } elsif ($envname eq "maptoguest") { @@ -241,11 +241,11 @@ sub setup_nt4_dc($$) return $vars; } -sub setup_s3dc_schannel($$) +sub setup_nt4_dc_schannel($$) { my ($self, $path) = @_; - print "PROVISIONING S3DC WITH SERVER SCHANNEL ..."; + print "PROVISIONING NT4 DC WITH SERVER SCHANNEL ..."; my $pdc_options = " domain master = yes @@ -267,8 +267,8 @@ sub setup_s3dc_schannel($$) "; my $vars = $self->provision($path, - "LOCALS3DC9", - "locals3dc9pass", + "LOCALNT4DC9", + "localntdc9pass", $pdc_options); $vars or return undef; @@ -284,7 +284,7 @@ sub setup_s3dc_schannel($$) $vars->{DC_USERNAME} = $vars->{USERNAME}; $vars->{DC_PASSWORD} = $vars->{PASSWORD}; - $self->{vars}->{s3dc_schannel} = $vars; + $self->{vars}->{nt4_dc_schannel} = $vars; return $vars; } |