summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2017-10-30 14:36:46 +0100
committerKarolin Seeger <kseeger@samba.org>2018-04-19 11:40:11 +0200
commit61470f63f8c053f393070f6052f77fb0a9d7a4cc (patch)
treeeccf1ff33e47d2277e7e9b7a6fa21e7af49d0d0d /source3
parentdaf2c88a3fcc4b619da131c95595584bca80c345 (diff)
downloadsamba-61470f63f8c053f393070f6052f77fb0a9d7a4cc.tar.gz
libsmb: Handle IO_TIMEOUT in cli_smb2_notify properly
Bug: https://bugzilla.samba.org/show_bug.cgi?id=13382 Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> (cherry picked from commit abfe482828e8c1dc233d67657a4d11a91a731f70)
Diffstat (limited to 'source3')
-rw-r--r--source3/libsmb/cli_smb2_fnum.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/source3/libsmb/cli_smb2_fnum.c b/source3/libsmb/cli_smb2_fnum.c
index 2d87b58d730..c397b29b381 100644
--- a/source3/libsmb/cli_smb2_fnum.c
+++ b/source3/libsmb/cli_smb2_fnum.c
@@ -4192,6 +4192,15 @@ NTSTATUS cli_smb2_notify(struct cli_state *cli, uint16_t fnum,
completion_filter, recursive,
frame, &base, &len);
+ if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) {
+ len = 0;
+ status = NT_STATUS_OK;
+ }
+
+ if (!NT_STATUS_IS_OK(status)) {
+ goto fail;
+ }
+
ofs = 0;
while (len - ofs >= 12) {