git.samba.org
/
kamenim
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
982f688
)
s4:selftest Remove unused basedn specification in selftest env setup
author
Andrew Bartlett
<abartlet@samba.org>
Tue, 15 Jun 2010 00:20:37 +0000
(10:20 +1000)
committer
Andrew Bartlett
<abartlet@samba.org>
Tue, 15 Jun 2010 00:53:43 +0000
(10:53 +1000)
selftest/target/Samba4.pm
patch
|
blob
|
history
diff --git
a/selftest/target/Samba4.pm
b/selftest/target/Samba4.pm
index e82ccfdfab264d0aeff95d8bc47cc845a746199b..343834cb453eb3033fc2f6e9127e78da36a0fe0b 100644
(file)
--- a/
selftest/target/Samba4.pm
+++ b/
selftest/target/Samba4.pm
@@
-472,8
+472,7
@@
sub provision_raw_prepare($$$$$$$)
$ctx->{username} = "Administrator";
$ctx->{domain} = "SAMBADOMAIN";
$ctx->{realm} = "SAMBA.EXAMPLE.COM";
$ctx->{username} = "Administrator";
$ctx->{domain} = "SAMBADOMAIN";
$ctx->{realm} = "SAMBA.EXAMPLE.COM";
- $ctx->{dnsname} = "samba.example.com";
- $ctx->{basedn} = "dc=samba,dc=example,dc=com";
+ $ctx->{dnsname} = lc($ctx->{realm});
$ctx->{sid_generator} = "internal";
my $unix_name = ($ENV{USER} or $ENV{LOGNAME} or `whoami`);
$ctx->{sid_generator} = "internal";
my $unix_name = ($ENV{USER} or $ENV{LOGNAME} or `whoami`);
@@
-501,9
+500,6
@@
sub provision_raw_prepare($$$$$$$)
$ctx->{ipv4} = "127.0.0.$swiface";
$ctx->{interfaces} = "$ctx->{ipv4}/8";
$ctx->{ipv4} = "127.0.0.$swiface";
$ctx->{interfaces} = "$ctx->{ipv4}/8";
- $ctx->{localbasedn} = $ctx->{basedn};
- $ctx->{localbasedn} = "CN=$netbiosname" if $server_role eq "member server";
-
push(@{$ctx->{directories}}, $ctx->{privatedir});
push(@{$ctx->{directories}}, $ctx->{etcdir});
push(@{$ctx->{directories}}, $ctx->{piddir});
push(@{$ctx->{directories}}, $ctx->{privatedir});
push(@{$ctx->{directories}}, $ctx->{etcdir});
push(@{$ctx->{directories}}, $ctx->{piddir});