sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

s3: selftest: Add two tests that show we try and send an SMB1 request over an SMB2 connection to list servers if "-mSMB3" is selected.

Browse Source 
Add knownfail: knownfail.d/list_servers

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14939

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Noel Power <npower@samba.org>
This commit is contained in:
Jeremy Allison 2022-01-03 16:48:17 -08:00 committed by Noel Power
parent 42cf3f4f00
commit 0d9d1546a7
3 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
selftest/knownfail.d/list_servers Normal file
View File

@ -0,0 +1 @@
^samba3.blackbox.test_list_servers.*

45
source3/script/tests/test_smbclient_list_servers.sh Executable file
View File

@ -0,0 +1,45 @@
#!/bin/sh
#
# Ensure we don't get an error smb1cli_req_writev_submit: called for dialect[SMB3_11]
# when listing servers via -L.
# BUG: https://bugzilla.samba.org/show_bug.cgi?id=14939
if [ $# -lt 5 ]; then
cat <<EOF
Usage: test_smbclient_list_servers.sh SERVER SERVER_IP USERNAME PASSWORD SMBCLIENT
EOF
exit 1;
fi
SERVER="$1"
SERVER_IP="$2"
USERNAME="$3"
PASSWORD="$4"
SMBCLIENT="$5"
shift 5
ADDARGS="$@"
incdir=$(dirname "$0")/../../../testprogs/blackbox
. "$incdir/subunit.sh"
failed=0
test_smbclient_list_servers()
{
cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT -L //$SERVER -U$USERNAME%$PASSWORD -I $SERVER_IP -p139 "$ADDARGS" </dev/null 2>&1'
eval echo "$cmd"
out=$(eval "$cmd")
echo "$out" | grep 'smb1cli_req_writev_submit:'
ret=$?
if [ $ret -eq 0 ] ; then
echo "$out"
echo 'failed - should not get: smb1cli_req_writev_submit: error.'
return 1
fi
return 0
}
testit "smb1_list_servers" test_smbclient_list_servers || failed=$((failed+1))
testok "$0" "$failed"

18
source3/selftest/tests.py
View File

@ -560,6 +560,24 @@ for env in ["fileserver"]:
plantestsuite("samba3.blackbox.test_dangle_rmdir", env,
[os.path.join(samba3srcdir, "script/tests/test_delete_veto_files_only_rmdir.sh"),
'$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$LOCAL_PATH/veto', smbclient3])
plantestsuite("samba3.blackbox.test_list_servers.NT1",
env + "_smb1_done",
[os.path.join(samba3srcdir, "script/tests/test_smbclient_list_servers.sh"),
'$SERVER',
'$SERVER_IP',
'$USERNAME',
'$PASSWORD',
smbclient3,
"-mSMB3"])
plantestsuite("samba3.blackbox.test_list_servers.SMB2",
env,
[os.path.join(samba3srcdir, "script/tests/test_smbclient_list_servers.sh"),
'$SERVER',
'$SERVER_IP',
'$USERNAME',
'$PASSWORD',
smbclient3,
"-mSMB3"])
#
# tar command tests