From: Christof Schmitt Date: Fri, 12 Jun 2015 15:37:30 +0000 (-0700) Subject: selftest: Add callout scripts for RPC SRVSVC share modifications X-Git-Tag: talloc-2.1.3~494 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=206483364344946236831491bb0aac97162bf3ec;p=thirdparty%2Fsamba.git selftest: Add callout scripts for RPC SRVSVC share modifications Signed-off-by: Christof Schmitt Reviewed-by: Volker Lendecke --- diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 50898f2010d..f7f663206c2 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -1214,6 +1214,11 @@ sub provision($$$$$$$$) # fsrvp server requires registry shares registry shares = yes + # Used by RPC SRVSVC tests + add share command = $bindir_abs/smbaddshare + change share command = $bindir_abs/smbchangeshare + delete share command = $bindir_abs/smbdeleteshare + # Begin extra options $extra_options # End extra options diff --git a/source3/script/smbaddshare b/source3/script/smbaddshare new file mode 100755 index 00000000000..62f1bdf4f17 --- /dev/null +++ b/source3/script/smbaddshare @@ -0,0 +1,32 @@ +#!/bin/sh +# +# smbaddshare +# +# Copyright (C) 2015 Christof Schmitt +# +# Example script that can be used with the 'add share command' config +# option. This is mainly intended for use in the Samba selftest suite, +# please review and adapt it before using elsewhere. +# + +CONF="$1" +SHARENAME="$2" +SHAREPATH="$3" +COMMENT="$4" +MAX_CONN="$5" + +NETCONF="$BINDIR/net --configfile=$CONF conf" + +$NETCONF addshare "$SHARENAME" "$SHAREPATH" writeable=no guest_ok=no "$COMMENT" +RC=$? +if [[ $RC -ne 0 ]]; then + echo Failure during addshare: rc=$RC + exit $RC +fi + +$NETCONF setparm "$SHARENAME" 'max connections' "$MAX_CONN" +RC=$? +if [[ $RC -ne 0 ]]; then + echo Failure during setparm for max connections: rc=$RC + exit $RC +fi diff --git a/source3/script/smbchangeshare b/source3/script/smbchangeshare new file mode 100755 index 00000000000..2f3fa3ba3ba --- /dev/null +++ b/source3/script/smbchangeshare @@ -0,0 +1,47 @@ +#!/bin/sh +# +# smbchangeshare +# +# Copyright (C) 2015 Christof Schmitt +# +# Example script that can be used with the 'change share command' +# config option. This is mainly intended for use in the Samba selftest +# suite, please review and adapt it before using elsewhere. +# + +CONF="$1" +SHARENAME="$2" +SHAREPATH="$3" +COMMENT="$4" +MAX_CONN="$5" +CSC_POLICY="$6" + +NETCONF="$BINDIR/net --configfile=$CONF conf" + +$NETCONF setparm "$SHARENAME" 'path' "$SHAREPATH" +RC=$? +if [[ $RC -ne 0 ]]; then + echo Failure during setparm for path: rc=$RC + exit $RC +fi + +$NETCONF setparm "$SHARENAME" 'comment' "$COMMENT" +RC=$? +if [[ $RC -ne 0 ]]; then + echo Failed during setparm for comment: rc=$RC + exit $RC +fi + +$NETCONF setparm "$SHARENAME" 'max connections' "$MAX_CONN" +RC=$? +if [[ $RC -ne 0 ]]; then + echo Failure during setparm for max connections: rc=$RC + exit $RC +fi + +$NETCONF setparm "$SHARENAME" 'csc policy' "$CSC_POLICY" +RC=$? +if [[ $RC -ne 0 ]]; then + echo Failure during setparm for csc policy: rc=$RC + exit $RC +fi diff --git a/source3/script/smbdeleteshare b/source3/script/smbdeleteshare new file mode 100755 index 00000000000..8cd8d1f4c19 --- /dev/null +++ b/source3/script/smbdeleteshare @@ -0,0 +1,21 @@ +#!/bin/sh +# +# smbdeleteshare +# +# Copyright (C) 2015 Christof Schmitt +# +# Example script that can be used with the 'delete share command' +# config option. This is mainly intended for use in the Samba selftest +# suite, please review and adapt it before using elsewhere. +# + +CONF="$1" +SHARENAME="$2" + +NETCONF="$BINDIR/net --configfile=$CONF conf" +$NETCONF delshare "$SHARENAME" +RC=$? +if [[ $RC -ne 0 ]]; then + echo Failure during delshare command: rc=$RC + exit $RC +fi diff --git a/source3/script/wscript_build b/source3/script/wscript_build index fc59a65687c..56c904fe349 100644 --- a/source3/script/wscript_build +++ b/source3/script/wscript_build @@ -5,3 +5,8 @@ from samba_utils import MODE_755 bld.INSTALL_FILES('${BINDIR}', 'smbtar', chmod=MODE_755, flat=True) + +# Callout scripts for use in selftest environment +bld.SAMBA_SCRIPT('smbaddshare', pattern='smbaddshare', installdir='.') +bld.SAMBA_SCRIPT('smbchangeshare', pattern='smbchangeshare', installdir='.') +bld.SAMBA_SCRIPT('smbdeleteshare', pattern='smbdeleteshare', installdir='.')