From: Michael Adam Date: Wed, 16 Feb 2011 13:47:02 +0000 (+0100) Subject: s3:test: remove the give/take admin rights code from the net(rpc)registry test X-Git-Tag: tevent-0.9.11~580 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ae9eca61ebd70d05b4defdfdf43e2d12fd8bb816;p=thirdparty%2Fsamba.git 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. --- diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh index 6482628ef22..45f4dd09cc7 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