svn commit: samba r7499 - in branches/SAMBA_4_0/source: script/tests setup

[tridge at samba.org]

Author: tridge
Date: 2005-06-12 06:35:18 +0000 (Sun, 12 Jun 2005)
New Revision: 7499

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

Log:
ensure that the account we run tests as ("Administrator") maps to the
unixName that we are running as in the test suite. Otherwise files are
created as a user without any entry in the sam, so the ACL doesn't
allow that user read permission when it should. This should fix the
RAW-ACLS test in the build farm.

Modified:
   branches/SAMBA_4_0/source/script/tests/selftest.sh
   branches/SAMBA_4_0/source/setup/provision.ldif
   branches/SAMBA_4_0/source/setup/provision.pl


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/selftest.sh	2005-06-12 03:07:10 UTC (rev 7498)
+++ branches/SAMBA_4_0/source/script/tests/selftest.sh	2005-06-12 06:35:18 UTC (rev 7499)
@@ -3,6 +3,7 @@
 USERNAME=administrator
 REALM=$DOMAIN
 PASSWORD=penguin
+ROOT=$USER
 SRCDIR=`pwd`
 
 if [ $# -lt 1 ]
@@ -38,7 +39,8 @@
 
 rm -rf $PREFIX/*
 mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $NCALRPCDIR $LOCKDIR $TMPDIR
-./setup/provision.pl --quiet --outputdir $PRIVATEDIR --domain $DOMAIN --realm $REALM --adminpass $PASSWORD
+./setup/provision.pl --quiet --outputdir $PRIVATEDIR --domain $DOMAIN --realm $REALM \
+    --adminpass $PASSWORD --root=$ROOT
 
 cat >$CONFFILE<<EOF
 [global]

Modified: branches/SAMBA_4_0/source/setup/provision.ldif
===================================================================
--- branches/SAMBA_4_0/source/setup/provision.ldif	2005-06-12 03:07:10 UTC (rev 7498)
+++ branches/SAMBA_4_0/source/setup/provision.ldif	2005-06-12 06:35:18 UTC (rev 7499)
@@ -298,7 +298,7 @@
 objectCategory: CN=Person,CN=Schema,CN=Configuration,${BASEDN}
 isCriticalSystemObject: TRUE
 unicodePwd: ${ADMINPASS}
-unixName: root
+unixName: ${ROOT}
 
 dn: CN=Guest,CN=Users,${BASEDN}
 objectClass: top

Modified: branches/SAMBA_4_0/source/setup/provision.pl
===================================================================
--- branches/SAMBA_4_0/source/setup/provision.pl	2005-06-12 03:07:10 UTC (rev 7498)
+++ branches/SAMBA_4_0/source/setup/provision.pl	2005-06-12 06:35:18 UTC (rev 7499)
@@ -10,6 +10,7 @@
 my $opt_realm;
 my $opt_domain;
 my $opt_adminpass;
+my $opt_root;
 my $opt_nobody;
 my $opt_nogroup;
 my $opt_wheel;
@@ -171,6 +172,10 @@
 		return $opt_nobody;
 	}
 
+	if ($var eq "ROOT") {
+		return $opt_root;
+	}
+
 	if ($var eq "NOGROUP") {
 		return $opt_nogroup;
 	}
@@ -278,6 +283,7 @@
  --invocationid	GUID		set invocationid (otherwise random)
  --outputdir	OUTPUTDIR	set output directory
  --adminpass	PASSWORD	choose admin password (otherwise random)
+ --root         USERNAME	choose 'root' unix username
  --nobody	USERNAME	choose 'nobody' user
  --nogroup	GROUPNAME	choose 'nogroup' group
  --wheel	GROUPNAME	choose 'wheel' privileged group
@@ -303,6 +309,7 @@
 	    'host-guid=s' => \$opt_hostguid,
 	    'invocationid=s' => \$opt_invocationid,
 	    'adminpass=s' => \$opt_adminpass,
+	    'root=s' => \$opt_root,
 	    'nobody=s' => \$opt_nobody,
 	    'nogroup=s' => \$opt_nogroup,
 	    'wheel=s' => \$opt_wheel,
@@ -334,6 +341,10 @@
 
 $opt_quiet or print "Provisioning host '$opt_hostname'[$opt_hostip] for domain '$opt_domain' in realm '$opt_realm'\n"; 
 
+if (!$opt_root) {
+	$opt_root = "root";
+}
+
 if (!$opt_nobody) {
 	if (defined getpwnam("nobody")) {
 		$opt_nobody = "nobody";
@@ -380,7 +391,7 @@
 $data .= add_foreign("S-1-5-7", "Anonymous", "\${NOBODY}");
 $data .= add_foreign("S-1-1-0", "World", "\${NOGROUP}");
 $data .= add_foreign("S-1-5-2", "Network", "\${NOGROUP}");
-$data .= add_foreign("S-1-5-18", "System", "root");
+$data .= add_foreign("S-1-5-18", "System", "\${ROOT}");
 $data .= add_foreign("S-1-5-11", "Authenticated Users", "\${USERS}");
 
 if (!$opt_adminpass) {