summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-11-05 15:12:54 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:44:17 +0100
commite196aa57b336d9e5524d874fe4fd9240174a34b7 (patch)
tree156a0f62b3623812291c7b57d6c0a18d43a535e4
parenta8ba7455c9051934e5e215b436a866a28f122930 (diff)
downloadsamba-e196aa57b336d9e5524d874fe4fd9240174a34b7.tar.gz
samba-e196aa57b336d9e5524d874fe4fd9240174a34b7.tar.bz2
samba-e196aa57b336d9e5524d874fe4fd9240174a34b7.zip
r25833: - we don't need --root twice
- use $unix_name to make more clear what this variable means metze (This used to be commit 6150286de832c239b1640f7f69d269a500437a45)
-rw-r--r--source4/selftest/env/Samba4.pm7
1 files changed, 3 insertions, 4 deletions
diff --git a/source4/selftest/env/Samba4.pm b/source4/selftest/env/Samba4.pm
index a43c4dc965..6750d17633 100644
--- a/source4/selftest/env/Samba4.pm
+++ b/source4/selftest/env/Samba4.pm
@@ -447,7 +447,7 @@ sub provision($$$$$$)
my $realm = "SAMBA.EXAMPLE.COM";
my $dnsname = "samba.example.com";
my $basedn = "dc=samba,dc=example,dc=com";
- my $root = ($ENV{USER} or $ENV{LOGNAME} or `whoami`);
+ my $unix_name = ($ENV{USER} or $ENV{LOGNAME} or `whoami`);
my $srcdir="$RealBin/..";
-d $prefix or mkdir($prefix, 0777) or die("Unable to create $prefix");
my $prefix_abs = abs_path($prefix);
@@ -595,10 +595,9 @@ my @provision_options = ("$self->{bindir}/smbscript", "$self->{setupdir}/provisi
push (@provision_options, "--adminpass=$password");
push (@provision_options, "--krbtgtpass=krbtgt$password");
push (@provision_options, "--machinepass=machine$password");
- push (@provision_options, "--root=$root");
+ push (@provision_options, "--root=$unix_name");
push (@provision_options, "--simple-bind-dn=cn=Manager,$localbasedn");
push (@provision_options, "--password=$password");
- push (@provision_options, "--root=$root");
push (@provision_options, "--server-role=$server_role");
my $ldap_uri= "$ldapdir/ldapi";
@@ -629,7 +628,7 @@ my @provision_options = ("$self->{bindir}/smbscript", "$self->{setupdir}/provisi
if (defined($self->{ldap})) {
push (@provision_options, "--ldap-backend=$ldap_uri");
- system("$self->{bindir}/smbscript $self->{setupdir}/provision-backend $configuration --ldap-manager-pass=$password --root=$root --realm=$realm --host-name=$netbiosname --ldap-backend-type=$self->{ldap}>&2") == 0 or die("backend provision failed");
+ system("$self->{bindir}/smbscript $self->{setupdir}/provision-backend $configuration --ldap-manager-pass=$password --root=$unix_name --realm=$realm --host-name=$netbiosname --ldap-backend-type=$self->{ldap}>&2") == 0 or die("backend provision failed");
if ($self->{ldap} eq "openldap") {
($ret->{SLAPD_CONF}, $ret->{OPENLDAP_PIDFILE}) = $self->mk_openldap($ldapdir, $configuration) or die("Unable to create openldap directories");