summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-05-22 14:18:17 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:08:25 -0500
commit184c28844d9a2186053ea23920607831299100a7 (patch)
tree27760f31c9142538f3dcd7fcdde7220ac19ab22f
parentc51dfa7926c7c961605e341b34c01ec744b60e39 (diff)
downloadsamba-184c28844d9a2186053ea23920607831299100a7.tar.gz
samba-184c28844d9a2186053ea23920607831299100a7.tar.bz2
samba-184c28844d9a2186053ea23920607831299100a7.zip
r15803: the SMB2 server gives NT_STATUS_NOT_FOUND instead of NT_STATUS_INVALID_HANDLE
metze (This used to be commit aa98aad0975e59fc8cf56c624f728b33ab54e099)
-rw-r--r--source4/smb_server/smb2/smb2_server.h2
-rw-r--r--source4/torture/smb2/connect.c6
2 files changed, 7 insertions, 1 deletions
diff --git a/source4/smb_server/smb2/smb2_server.h b/source4/smb_server/smb2/smb2_server.h
index 4f4e769940..daf7e315c2 100644
--- a/source4/smb_server/smb2/smb2_server.h
+++ b/source4/smb_server/smb2/smb2_server.h
@@ -114,7 +114,7 @@ struct smbsrv_request;
#define SMB2SRV_CHECK_FILE_HANDLE(handle) do { \
if (!handle) { \
- smb2srv_send_error(req, NT_STATUS_INVALID_HANDLE); \
+ smb2srv_send_error(req, NT_STATUS_NOT_FOUND); \
return; \
} \
} while (0)
diff --git a/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c
index 54075b17d0..3b12e54a3b 100644
--- a/source4/torture/smb2/connect.c
+++ b/source4/torture/smb2/connect.c
@@ -207,6 +207,12 @@ BOOL torture_smb2_connect(struct torture_context *torture)
torture_smb2_close(tree, h1);
torture_smb2_close(tree, h2);
+ status = smb2_util_close(tree, h1);
+ if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
+ printf("close should have closed the handle - %s\n", nt_errstr(status));
+ return False;
+ }
+
status = smb2_tdis(tree);
if (!NT_STATUS_IS_OK(status)) {
printf("tdis failed - %s\n", nt_errstr(status));