svn commit: samba r25833 - in branches/SAMBA_4_0/source/selftest/env: .

[metze at samba.org]

Author: metze
Date: 2007-11-05 15:12:54 +0000 (Mon, 05 Nov 2007)
New Revision: 25833

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25833

Log:
- we don't need --root twice
- use $unix_name to make more clear what this variable means

metze
Modified:
   branches/SAMBA_4_0/source/selftest/env/Samba4.pm


Changeset:
Modified: branches/SAMBA_4_0/source/selftest/env/Samba4.pm
===================================================================
--- branches/SAMBA_4_0/source/selftest/env/Samba4.pm	2007-11-05 13:35:00 UTC (rev 25832)
+++ branches/SAMBA_4_0/source/selftest/env/Samba4.pm	2007-11-05 15:12:54 UTC (rev 25833)
@@ -447,7 +447,7 @@
 	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 @@
 	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 @@
 	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");