[SCM] Samba Shared Repository - branch master updated
Michael Adam
obnox at samba.org
Wed Feb 16 08:06:01 MST 2011
The branch, master has been updated
via c819e3e s3:test: run the net.rpc.registry test under "dc" not "dc:local"
via ae9eca6 s3:test: remove the give/take admin rights code from the net(rpc)registry test
via 8e45fb4 s3:test: rename samba3.blackbox.testparm_s3 -> samba3.blackbox.testparm
via 838de3c s3:test: rename samba3.blackbox.net_s3_registry_roundtrip -> samba3.blackbox.net.local.registry.roundtrip
via 86ed1e7 s3:test: rename samba3.blackbox.net_s3_registry_rpc -> samba3.blackbox.net.rpc.registry
via 395d8f4 s3:test: rename samba3.blackbox.net_s3_registry -> samba3.blackbox.net.local.registry
via 2c77ece s3:test: rename samba3.blackbox.net_s3_misc --> samba3.blackbox.net.misc
from c66dfe4 s3-build: move priv2ld proto to smbldap.h (in order to fix non-ldap builds).
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c819e3e862f4b159e0f65c732ea093c0b2d67571
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 16 14:48:16 2011 +0100
s3:test: run the net.rpc.registry test under "dc" not "dc:local"
There is no need to run it on the rpc server, but it should
be run from a remote host.
Autobuild-User: Michael Adam <obnox at samba.org>
Autobuild-Date: Wed Feb 16 16:05:58 CET 2011 on sn-devel-104
commit ae9eca61ebd70d05b4defdfdf43e2d12fd8bb816
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 16 14:47:02 2011 +0100
s3:test: remove the give/take admin rights code from the net(rpc)registry test
This is not neede any more.
The token has been fixed at the lower level on the dc.
commit 8e45fb4a839c43a0a7b58031e837e0701c1c0f0a
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 16 14:43:41 2011 +0100
s3:test: rename samba3.blackbox.testparm_s3 -> samba3.blackbox.testparm
commit 838de3cdd34bc1946f9b2899013c47377832ef67
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 16 14:39:26 2011 +0100
s3:test: rename samba3.blackbox.net_s3_registry_roundtrip -> samba3.blackbox.net.local.registry.roundtrip
commit 86ed1e77c7c33ad6c7a22552b8dd9a4d96df7e92
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 16 14:37:05 2011 +0100
s3:test: rename samba3.blackbox.net_s3_registry_rpc -> samba3.blackbox.net.rpc.registry
commit 395d8f41d6469976bcc4b20a6662a2522d2fb6a6
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 16 14:37:05 2011 +0100
s3:test: rename samba3.blackbox.net_s3_registry -> samba3.blackbox.net.local.registry
commit 2c77ece81b6365aa8854c89e9a67ad8797bcba39
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 16 14:35:53 2011 +0100
s3:test: rename samba3.blackbox.net_s3_misc --> samba3.blackbox.net.misc
-----------------------------------------------------------------------
Summary of changes:
source3/script/tests/test_net_registry.sh | 44 -----------------------------
source3/selftest/knownfail | 2 +-
source3/selftest/tests.sh | 10 +++---
3 files changed, 6 insertions(+), 50 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh
index 6482628..45f4dd0 100755
--- a/source3/script/tests/test_net_registry.sh
+++ b/source3/script/tests/test_net_registry.sh
@@ -320,44 +320,6 @@ test_setvalue_twice()
${NETREG} setvalue ${KEY} "${VALNAME}" ${VALTYPE2} ${VALVALUE2}
}
-give_administrative_rights()
-{
- 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
- else
- true
- fi
-}
-
-take_administrative_rights()
-{
- bin/net -s $SERVERCONFFILE sam delmem BUILTIN\\Administrators $USERNAME
- if test "x$?" != "x0" ; then
- echo "ERROR: removing user $USERNAME from BUILTIN\\Administrators"
- false
- else
- true
- fi
-}
-
-
-if test "x${RPC}" = "xrpc" ; then
-testit "giving user ${USERNAME} administrative rights" \
- give_administrative_rights
- if [ "x$?" != "x0" ] ; then
- failed=`expr $failed + 1`
- testok $0 $failed
- fi
-fi
testit "enumerate HKLM" \
test_enumerate HKLM || \
@@ -438,12 +400,6 @@ testit "delete key with value" \
test_deletekey HKLM/testkey || \
failed=`expr $failed + 1`
-if test "x${RPC}" = "xrpc" ; then
-testit "taking administrative rights from user ${USERNAME}" \
- take_administrative_rights || \
- failed=`expr $failed + 1`
-fi
-
testok $0 $failed
diff --git a/source3/selftest/knownfail b/source3/selftest/knownfail
index 9f80919..6624abb 100644
--- a/source3/selftest/knownfail
+++ b/source3/selftest/knownfail
@@ -6,4 +6,4 @@ samba3.posix_s3.rpc.spoolss.*printserver.enum_printers_old # fails on some hosts
samba3.posix_s3.rpc.spoolss.printer.*addprinterex.print_test # another intermittent failure
samba3.posix_s3.smb2.lock.*.rw-exclusive # another intermittent failure
.*driver.add_driver_timestamps # we only can store dates, not timestamps
-samba3.blackbox.net_s3_registry_roundtrip # this test needs fixing
+samba3.blackbox.net.local.registry.roundtrip # this test needs fixing
diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh
index a91ae01..7603602 100755
--- a/source3/selftest/tests.sh
+++ b/source3/selftest/tests.sh
@@ -152,11 +152,11 @@ 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_misc" dc:local BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_net_misc.sh
-plantest "blackbox.net_s3_registry" dc:local BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_net_registry.sh
-plantest "blackbox.net_s3_registry_rpc" dc:local BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_net_registry.sh rpc
-plantest "blackbox.net_s3_registry_roundtrip" dc:local BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_net_registry_roundtrip.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
+plantest "blackbox.net.misc" dc:local BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_net_misc.sh
+plantest "blackbox.net.local.registry" dc:local BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_net_registry.sh
+plantest "blackbox.net.rpc.registry" dc BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_net_registry.sh rpc
+plantest "blackbox.net.local.registry.roundtrip" dc:local BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_net_registry_roundtrip.sh
+plantest "blackbox.testparm" dc:local LOCAL_PATH="$LOCAL_PATH" BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_testparm_s3.sh
(
shift $#
--
Samba Shared Repository
More information about the samba-cvs
mailing list