[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha6-443-g98e2fe5
Stefan Metzmacher
metze at samba.org
Tue Feb 3 16:45:19 GMT 2009
The branch, master has been updated
via 98e2fe5e6d7634aa1ecf12b1b1fb23c82b3f16c5 (commit)
via 484c4a5955d0365beb9587bb15c73fe3ed3301ce (commit)
via aa9592991a1f406708fc08fd32cd630f0e9ed43d (commit)
from 8b408f781970b3f2b310389f9ae73ad0c5e42881 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 98e2fe5e6d7634aa1ecf12b1b1fb23c82b3f16c5
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 3 17:43:23 2009 +0100
s3:selftest: fix blackbox.net_s3 tests
metze
commit 484c4a5955d0365beb9587bb15c73fe3ed3301ce
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 3 17:05:24 2009 +0100
Revert "s3:selftest: create BUILTIN\\Administrators at startup"
This reverts commit a849183f9492d09ccd7e273f955d4d8f2668fdf3.
This is to racy for most of the build-farm machines,
because winbindd doesn't start fast enough.
metze
commit aa9592991a1f406708fc08fd32cd630f0e9ed43d
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 3 17:04:42 2009 +0100
Revert "s3:test: try to find why creating BUILTIN\Administrators doesn't work in the build-farm"
This reverts commit 20a1cb15699c781651593c68685ece91c03e6a18.
I will also revert a849183f9492d09ccd7e273f955d4d8f2668fdf3
metze
-----------------------------------------------------------------------
Summary of changes:
source3/script/tests/selftest.sh | 9 ---------
source3/script/tests/test_net_registry.sh | 15 ++++++++++-----
source3/selftest/tests.sh | 2 +-
3 files changed, 11 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index af01d0f..9462184 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -345,15 +345,6 @@ START=`date`
bin/smbclient $CONFIGURATION -L $SERVER_IP -U% -p 139 | head -2
MAKE_TEST_BINARY=""
- MAKE_TEST_BINARY="bin/net"
- printf "%s\n" "creating BUILTIN\\Administrators..."
- bin/net -s $SERVERCONFFILE sam createbuiltingroup Administrators || {
- echo "FAILED: $?"
- exit 1
- }
- echo "DONE"
- MAKE_TEST_BINARY=""
-
failed=0
. $SCRIPTDIR/tests_$SUBTESTS.sh
diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh
index a3d1a24..52a78bc 100755
--- a/source3/script/tests/test_net_registry.sh
+++ b/source3/script/tests/test_net_registry.sh
@@ -7,10 +7,8 @@ RPC="$1"
NET="$VALGRIND ${NET:-$BINDIR/net} $CONFIGURATION"
-NETREMOTE="${NET} -U${USERNAME}%${PASSWORD} -S ${SERVER} -I ${SERVER_IP}"
-
if test "x${RPC}" = "xrpc" ; then
- NETREG="${NETREMOTE} rpc registry"
+ NETREG="${NET} -U${USERNAME}%${PASSWORD} -I ${SERVER_IP} rpc registry"
else
NETREG="${NET} registry"
fi
@@ -336,7 +334,14 @@ test_setvalue_twice()
give_administrative_rights()
{
- ${NETREMOTE} rpc group addmem BUILTIN\\Administrators $USERNAME
+ bin/net -s $SERVERCONFFILE sam createbuiltingroup Administrators
+ if test "x$?" != "x0" ; then
+ echo "ERROR: creating builtin group Administrators"
+ false
+ return
+ fi
+
+ bin/net -s $SERVERCONFFILE sam addmem BUILTIN\\Administrators $USERNAME
if test "x$?" != "x0" ; then
echo "ERROR: adding user $USERNAME to BUILTIN\\Administrators"
false
@@ -347,7 +352,7 @@ give_administrative_rights()
take_administrative_rights()
{
- ${NETREMOTE} rpc group delmem BUILTIN\\Administrators $USERNAME
+ bin/net -s $SERVERCONFFILE sam delmem BUILTIN\\Administrators $USERNAME
if test "x$?" != "x0" ; then
echo "ERROR: removing user $USERNAME from BUILTIN\\Administrators"
false
diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh
index 812a3a7..f88dab0 100755
--- a/source3/selftest/tests.sh
+++ b/source3/selftest/tests.sh
@@ -127,7 +127,7 @@ plantest "blackbox.smbclient_s3.crypt" dc BINDIR="$BINDIR" script/tests/test_smb
#plantest "blackbox.smbclient_s3.crypt member creds" member BINDIR="$BINDIR" script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP \$SERVER\\\\\$USERNAME \$PASSWORD "-e"
#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 BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" script/tests/test_net_s3.sh
+plantest "blackbox.net_s3" dc:local BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_net_s3.sh
(
shift $#
--
Samba Shared Repository
More information about the samba-cvs
mailing list