summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-03-11 13:06:17 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:57:04 -0500
commit40fe45deaab43da3400f652f8eb74e88e1202004 (patch)
tree504cd6a2dc41ced831bf6361307ca6dcfe849337 /source4
parent7f0c7702f6b9db216fcd6c29165b2a11ea1f24a9 (diff)
downloadsamba-40fe45deaab43da3400f652f8eb74e88e1202004.tar.gz
samba-40fe45deaab43da3400f652f8eb74e88e1202004.tar.bz2
samba-40fe45deaab43da3400f652f8eb74e88e1202004.zip
r14209: don't timeout notify requests in the cifs backend, as they are
intended to wait forever (This used to be commit 7d8da6611850a7eab964f02ccb1adaa8c2a4358f)
Diffstat (limited to 'source4')
-rw-r--r--source4/ntvfs/cifs/vfs_cifs.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c
index 2741e97d2d..9f3af57016 100644
--- a/source4/ntvfs/cifs/vfs_cifs.c
+++ b/source4/ntvfs/cifs/vfs_cifs.c
@@ -890,6 +890,7 @@ static NTSTATUS cvfs_notify(struct ntvfs_module_context *ntvfs,
{
struct cvfs_private *private = ntvfs->private_data;
struct smbcli_request *c_req;
+ int saved_timeout = private->transport->options.request_timeout;
SETUP_PID;
@@ -897,9 +898,15 @@ static NTSTATUS cvfs_notify(struct ntvfs_module_context *ntvfs,
if (!(req->async_states->state & NTVFS_ASYNC_STATE_MAY_ASYNC)) {
return NT_STATUS_INVALID_PARAMETER;
}
-
+
+ /* we must not timeout on notify requests - they wait
+ forever */
+ private->transport->options.request_timeout = 0;
+
c_req = smb_raw_changenotify_send(private->tree, info);
+ private->transport->options.request_timeout = saved_timeout;
+
ASYNC_RECV_TAIL(info, async_changenotify);
}