Rev 11307: Warn when not running as root and not using the socket wrapper. Fix a couple of syntax errors introduced by the last merge. in file:///home/jelmer/bzr.samba/4.0-perlselftest/

[Jelmer Vernooij]

At file:///home/jelmer/bzr.samba/4.0-perlselftest/

------------------------------------------------------------
revno: 11307
revision-id: jelmer at samba.org-20070201123242-dwdz7ryz7rmv15xz
parent: jelmer at samba.org-20070201122426-4auj1m5fmnbhsr9f
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 4.0-perlselftest
timestamp: Thu 2007-02-01 13:32:42 +0100
message:
  Warn when not running as root and not using the socket wrapper. Fix a couple of syntax errors introduced by the last merge.
modified:
  source/TODO                    todo-20070126140905-srlmy1f6yd4ba4lp-1
  source/script/tests/selftest.pl svn-v2:20693 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2fselftest.pl
=== modified file 'source/TODO'
--- a/source/TODO	2007-01-26 14:31:24 +0000
+++ b/source/TODO	2007-02-01 12:32:42 +0000
@@ -1,3 +1,2 @@
 - fix 'make testenv' and 'make valgrindtest-env'
 - warn about unexpected successes
-- warn when not using the socket wrapper but also not running as root

=== modified file 'source/script/tests/selftest.pl'
--- a/source/script/tests/selftest.pl	2007-02-01 12:24:26 +0000
+++ b/source/script/tests/selftest.pl	2007-02-01 12:32:42 +0000
@@ -140,6 +140,10 @@
 	my ($bindir, $test_fifo, $test_log, $socket_wrapper_dir, $max_time, $conffile) = @_;
 	return 0 if ( -p $test_fifo );
 
+	warn("Not using socket wrapper, but also not running as root. Will not be able to listen on proper ports") unless
+		defined($socket_wrapper_dir) or $< == 0;
+
+
 	if (defined($socket_wrapper_dir)) {
 		if ( -d $socket_wrapper_dir ) {
 			unlink <$socket_wrapper_dir/*>;
@@ -474,8 +478,8 @@
 		slapd_start($ENV{SLAPD_CONF}, $ENV{LDAPI_ESCAPE}) or die("couldn't start slapd");
 	}
     print "LDAP PROVISIONING...";
-    system("$bindir/smbscript $setupdir/provision $ENV{PROVISION_OPTIONS} "$ENV{PROVISION_ACI}" --ldap-backend=$ENV{LDAPI}") or
-		die("LDAP PROVISIONING failed: $bindir/smbscript $setupdir/provision $ENV{PROVISION_OPTIONS} "$ENV{PROVISION_ACI}" --ldap-backend=$ENV{LDAPI}");
+    system("$bindir/smbscript $setupdir/provision $ENV{PROVISION_OPTIONS} \"$ENV{PROVISION_ACI}\" --ldap-backend=$ENV{LDAPI}") or
+		die("LDAP PROVISIONING failed: $bindir/smbscript $setupdir/provision $ENV{PROVISION_OPTIONS} \"$ENV{PROVISION_ACI}\" --ldap-backend=$ENV{LDAPI}");
 
     # LDAP is slow
 	$torture_maxtime *= 2;
@@ -592,7 +596,7 @@
 if ($ldap) {
 	if (defined($ENV{FEDORA_DS_PREFIX})) {
 		system("$ENV{LDAPDIR}/slapd-samba4/stop-slapd");
-	else {
+	} else {
 		open(IN, "<$ENV{PIDDIR}/slapd.pid") or die("unable to open slapd pid file");
 		kill 9, <IN>;
 		close(IN);