[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  472d2a3... s3-selftest: fix testparm tests as non-root.
      from  ca8db7f... s3-smbd: Publish nt printers.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 472d2a356fe2fad8b54920d99e2829344fd646cd
Author: Günther Deschner <gd at samba.org>
Date:   Fri Aug 13 18:28:48 2010 +0200

    s3-selftest: fix testparm tests as non-root.
    
    Thanks to Andreas for pointing this out.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/script/tests/test_testparm_s3.sh |    2 +-
 source3/selftest/tests.sh                |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/script/tests/test_testparm_s3.sh b/source3/script/tests/test_testparm_s3.sh
index c88fc2d..b9e4b81 100755
--- a/source3/script/tests/test_testparm_s3.sh
+++ b/source3/script/tests/test_testparm_s3.sh
@@ -5,7 +5,7 @@
 # The main purpose (for now) is to test all the special handlers
 # and the macro expansions.
 
-TEMP_CONFFILE=${LIBDIR}/smb.conf.tmp
+TEMP_CONFFILE=${LOCAL_PATH}/smb.conf.tmp
 TESTPARM="$VALGRIND ${TESTPARM:-$BINDIR/testparm} --suppress-prompt --skip-logic-checks"
 
 test x"$TEST_FUNCTIONS_SH" != x"INCLUDED" && {
diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh
index 7042ba2..7a9e68a 100755
--- a/source3/selftest/tests.sh
+++ b/source3/selftest/tests.sh
@@ -81,6 +81,9 @@ export USERNAME
 PASSWORD="\$PASSWORD"
 export PASSWORD
 
+LOCAL_PATH="\$LOCAL_PATH"
+export LOCAL_PATH
+
 (
 	shift $#
 	testitprefix="local_s3."
@@ -147,7 +150,7 @@ plantest "blackbox.smbclient_s3.crypt" dc BINDIR="$BINDIR" script/tests/test_smb
 #plantest "blackbox.smbclient_s3.crypt domain creds" member BINDIR="$BINDIR" script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP \$DOMAIN\\\\\$DC_USERNAME \$DC_PASSWORD "-e"
 
 plantest "blackbox.net_s3" dc:local BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_net_s3.sh
-plantest "blackbox.testparm_s3" dc:local BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_testparm_s3.sh
+plantest "blackbox.testparm_s3" dc:local LOCAL_PATH="$LOCAL_PATH" BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_testparm_s3.sh
 
 (
 	shift $#


-- 
Samba Shared Repository