summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2011-02-16 14:47:02 +0100
committerMichael Adam <obnox@samba.org>2011-02-16 15:21:20 +0100
commitae9eca61ebd70d05b4defdfdf43e2d12fd8bb816 (patch)
treeb608d50711ce31ec03c7207a4792bd1384004326
parent8e45fb4a839c43a0a7b58031e837e0701c1c0f0a (diff)
downloadsamba-ae9eca61ebd70d05b4defdfdf43e2d12fd8bb816.tar.gz
samba-ae9eca61ebd70d05b4defdfdf43e2d12fd8bb816.tar.bz2
samba-ae9eca61ebd70d05b4defdfdf43e2d12fd8bb816.zip
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.
-rwxr-xr-xsource3/script/tests/test_net_registry.sh44
1 files changed, 0 insertions, 44 deletions
diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh
index 6482628ef2..45f4dd09cc 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