diff --git a/source3/script/format_indent.sh b/source3/script/format_indent.sh index 2af1ab41fae..11ef28590e2 100755 --- a/source3/script/format_indent.sh +++ b/source3/script/format_indent.sh @@ -6,7 +6,7 @@ # -ts8 Set tab size to 8 spaces # -sob Swallow optional blank lines. # -l80 Set the maximum line length at 80 characters. -# -ss On one-line for and while statments, force a blank before the semicolon +# -ss On one-line for and while statements, force a blank before the semicolon # -ncs Do not put a space after cast operators. indent -npro -kr -i8 -ts8 -sob -l80 -ss -ncs "$@" diff --git a/source3/script/tests/smbspool_argv_wrapper.c b/source3/script/tests/smbspool_argv_wrapper.c index 7db788109d9..f3024d9490d 100644 --- a/source3/script/tests/smbspool_argv_wrapper.c +++ b/source3/script/tests/smbspool_argv_wrapper.c @@ -24,7 +24,7 @@ /* * Before calling a backend like smbspool, CUPS will set argv[0] to * the Device URI. This program wraps a program like smbspool and - * sets argv[0] to the device URI before exec()ing the acutal backend + * sets argv[0] to the device URI before exec()ing the actual backend * program. */ diff --git a/source3/script/tests/test_net_misc.sh b/source3/script/tests/test_net_misc.sh index 94842182f66..3c2c01f1c40 100755 --- a/source3/script/tests/test_net_misc.sh +++ b/source3/script/tests/test_net_misc.sh @@ -14,7 +14,7 @@ SERVERCONFFILE="$2" NET="$3" CONFIGURATION="$4" -# optional protocl, default to NT1 +# optional protocol, default to NT1 if [ $# -gt 4 ]; then PROTOCOL="$5" else diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh index 4de0211e65b..155533eedb7 100755 --- a/source3/script/tests/test_net_registry.sh +++ b/source3/script/tests/test_net_registry.sh @@ -64,7 +64,7 @@ test_enumerate_no_key() { ${NETREG} enumerate if test "x$?" = "x0"; then - echo "ERROR: enumerate succeeded without any key spcified" + echo "ERROR: enumerate succeeded without any key specified" false else true @@ -118,7 +118,7 @@ test_createkey() EXPECTED="Keyname = ${SUBKEY}" printf "%s\n" "$OUTPUT" | grep '^Keyname' | grep ${SUBKEY} if test "x$?" != "x0"; then - echo "ERROR: did not find expexted '$EXPECTED' in output" + echo "ERROR: did not find expected '$EXPECTED' in output" echo "output:" printf "%s\n" "$OUTPUT" false diff --git a/source3/script/tests/test_sacl_set_get.sh b/source3/script/tests/test_sacl_set_get.sh index 3d36f57d2e2..1c78ab2034d 100755 --- a/source3/script/tests/test_sacl_set_get.sh +++ b/source3/script/tests/test_sacl_set_get.sh @@ -1,7 +1,7 @@ #!/bin/sh # # Runs the smbtorture3 SMB2-SACL test -# that requres SeSecurityPrivilege +# that requires SeSecurityPrivilege # against Samba. # diff --git a/source3/script/tests/test_smb1_system_security.sh b/source3/script/tests/test_smb1_system_security.sh index 656ae6765ea..dac889756fd 100755 --- a/source3/script/tests/test_smb1_system_security.sh +++ b/source3/script/tests/test_smb1_system_security.sh @@ -1,7 +1,7 @@ #!/bin/sh # # Runs the smbtorture3 SMB1-SYSTEM-SECURITY test -# that requres SeSecurityPrivilege against Samba. +# that requires SeSecurityPrivilege against Samba. # if [ $# -lt 7 ]; then diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh index fed1723a531..cbff5026ee7 100755 --- a/source3/script/tests/test_smbclient_s3.sh +++ b/source3/script/tests/test_smbclient_s3.sh @@ -551,7 +551,7 @@ EOF if [ $ret != 0 ] ; then echo "$out" - echo "failed deleteing $filename_src with error $ret" + echo "failed deleting $filename_src with error $ret" return 1 fi @@ -1142,7 +1142,7 @@ EOF fi } -# Test creating a stream on the root of the share directory filname - :foobar +# Test creating a stream on the root of the share directory filename - :foobar test_toplevel_stream() { tmpfile=$PREFIX/smbclient_interactive_prompt_commands diff --git a/source3/script/tests/test_smbclient_tarmode.pl b/source3/script/tests/test_smbclient_tarmode.pl index bdbbd1a44a8..fa69d28d4be 100755 --- a/source3/script/tests/test_smbclient_tarmode.pl +++ b/source3/script/tests/test_smbclient_tarmode.pl @@ -1146,7 +1146,7 @@ Run smbclient with C<@args> passed as argument and return output. Each element of C<@args> becomes one escaped argument of smbclient. -Host, share, user, password and the additionnal arguments provided on +Host, share, user, password and the additional arguments provided on the command-line are already inserted. The output contains both the C and C. @@ -1204,7 +1204,7 @@ Run smbclient with C<@args> passed as argument and return output. Each element of C<@args> becomes one escaped argument of smbclient. -Host, share, user, password and the additionnal arguments provided on +Host, share, user, password and the additional arguments provided on the command-line are already inserted. The output contains both the C and C. @@ -1498,7 +1498,7 @@ sub attr { Return DOS attributes as a compact string. - Read-only, hiden, system, archive => "rhsa" + Read-only, hidden, system, archive => "rhsa" =cut sub attr_str { diff --git a/source3/script/tests/test_smbclient_tarmode.sh b/source3/script/tests/test_smbclient_tarmode.sh index 7149df797f4..d48e4120f7d 100755 --- a/source3/script/tests/test_smbclient_tarmode.sh +++ b/source3/script/tests/test_smbclient_tarmode.sh @@ -165,7 +165,7 @@ test_tarmode_extraction() # Extract tarfile with smbclient if ! $SMBCLIENT //$SERVER/tarmode $CONFIGURATION -U$USERNAME%$PASSWORD -I $SERVER_IP -p 139 \ $ADDARGS -c "tarmode full" -Tx "$PREFIX/tarmode.tar"; then - echo "Couldn't extact tar file with tarmode -Tx" + echo "Couldn't extract tar file with tarmode -Tx" false return fi diff --git a/source3/script/tests/test_smbcquota.py b/source3/script/tests/test_smbcquota.py index 0136cc97ce6..3f67bd3c960 100755 --- a/source3/script/tests/test_smbcquota.py +++ b/source3/script/tests/test_smbcquota.py @@ -223,7 +223,7 @@ def main(): env.smbcquotas = sys.argv[6] quota_script = os.path.join(os.path.dirname(sys.argv[0]), "getset_quota.py") - #copy the quota script to the evironment + #copy the quota script to the environment shutil.copy2(quota_script, env.envdir) env.quota_db = os.path.join(env.envdir, "quotas.db") diff --git a/source3/script/tests/test_smbd_no_krb5.sh b/source3/script/tests/test_smbd_no_krb5.sh index 1715e652a4e..faa46c90833 100755 --- a/source3/script/tests/test_smbd_no_krb5.sh +++ b/source3/script/tests/test_smbd_no_krb5.sh @@ -31,7 +31,7 @@ opt="--option=gensec:gse_krb5=yes -U${USERNAME}%${PASSWORD}" # check kerberos access test_smbclient "test_krb5" "ls" "//$SERVER/tmp" $opt --use-kerberos=required || failed=$(expr $failed + 1) -# disbale krb5 globally so smbd won't accept it +# disable krb5 globally so smbd won't accept it global_inject_conf=$(dirname $SMB_CONF_PATH)/global_inject.conf echo 'gensec:gse_krb5=no' >$global_inject_conf diff --git a/source3/script/tests/test_smbspool.sh b/source3/script/tests/test_smbspool.sh index 1fcc9a8cc01..0fb2d0341e2 100755 --- a/source3/script/tests/test_smbspool.sh +++ b/source3/script/tests/test_smbspool.sh @@ -92,13 +92,13 @@ test_smbspool_authinforequired_unknown() } # -# The test enviornment uses 'vlp' (virtual lp) as the printing backend. +# The test environment uses 'vlp' (virtual lp) as the printing backend. # # When using the vlp backend the print job is only written to the database. # The job needs to removed manually using 'vlp lprm' command! # # This calls the 'vlp' command to check if the print job has been successfully -# added to the database and also makes sure the temorary print file has been +# added to the database and also makes sure the temporary print file has been # created. # # The function removes the print job from the vlp database if successful. diff --git a/source3/script/tests/vfstest-catia/run.sh b/source3/script/tests/vfstest-catia/run.sh index c015e26c72b..aca2a601fe5 100755 --- a/source3/script/tests/vfstest-catia/run.sh +++ b/source3/script/tests/vfstest-catia/run.sh @@ -16,7 +16,7 @@ VFSTEST_PREFIX=vfstest VFSTEST_TMPDIR=$(mktemp -d ${PREFIX}/${VFSTEST_PREFIX}_XXXXXX) # We could pass in the --option=... via tests.py as ADDARGS -# Atm i've choosen to specify them here: +# Atm i've chosen to specify them here: MYARGS1="--option=vfsobjects=catia" MYARGS2="--option=catia:mappings=0x22:0xa8,0x2a:0xa4,0x2f:0xf8,0x3a:0xf7,0x3c:0xab,0x3e:0xbb,0x3f:0xbf,0x5c:0xff,0x7c:0xa6,0x20:0xb1"