summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-07-01 14:27:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:09:42 -0500
commitdd44e2415ce2f0c6afddbb88b0c069ade95dc99f (patch)
tree74c02106137e0d14cc2af52576d93b09b3dbc242
parentd584033c6c04c0ded37c030a35fae518b09b053a (diff)
downloadsamba-dd44e2415ce2f0c6afddbb88b0c069ade95dc99f.tar.gz
samba-dd44e2415ce2f0c6afddbb88b0c069ade95dc99f.tar.bz2
samba-dd44e2415ce2f0c6afddbb88b0c069ade95dc99f.zip
r16738: vista beta2 use FILE_CLOSED as error for an invalid file handle
metze (This used to be commit fa35ddcaf9bbeaa4780aa3497cdff56b02af0ab9)
-rw-r--r--source4/smb_server/smb2/smb2_server.h2
-rw-r--r--source4/torture/smb2/connect.c2
-rw-r--r--source4/torture/smb2/lock.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/smb_server/smb2/smb2_server.h b/source4/smb_server/smb2/smb2_server.h
index f3ac78dee3..76d11e019c 100644
--- a/source4/smb_server/smb2/smb2_server.h
+++ b/source4/smb_server/smb2/smb2_server.h
@@ -116,7 +116,7 @@ struct smbsrv_request;
#define SMB2SRV_CHECK_FILE_HANDLE(handle) do { \
if (!handle) { \
- smb2srv_send_error(req, NT_STATUS_NOT_FOUND); \
+ smb2srv_send_error(req, NT_STATUS_FILE_CLOSED); \
return; \
} \
} while (0)
diff --git a/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c
index bd11f310d9..7d2773ebb6 100644
--- a/source4/torture/smb2/connect.c
+++ b/source4/torture/smb2/connect.c
@@ -220,7 +220,7 @@ BOOL torture_smb2_connect(struct torture_context *torture)
}
status = smb2_util_close(tree, h1);
- if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
+ if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
printf("close should have closed the handle - %s\n", nt_errstr(status));
return False;
}
diff --git a/source4/torture/smb2/lock.c b/source4/torture/smb2/lock.c
index 0bc90e126d..08caaf2d1f 100644
--- a/source4/torture/smb2/lock.c
+++ b/source4/torture/smb2/lock.c
@@ -82,7 +82,7 @@ static BOOL test_valid_request(TALLOC_CTX *mem_ctx, struct smb2_tree *tree)
lck.in.file.handle.data[0] +=1;
status = smb2_lock(tree, &lck);
- CHECK_STATUS(status, NT_STATUS_NOT_FOUND);
+ CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
lck.in.file.handle.data[0] -=1;
lck.in.unknown1 = 0x0001;