[SCM] Samba Shared Repository - branch master updated

Volker Lendecke vlendec at samba.org
Mon Apr 2 04:32:04 MDT 2012


The branch, master has been updated
       via  831a97c s3: Notifies should never time out
      from  13a4b72 s4-upgradedns: Fix the fqdn for forest dns zone

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 831a97c147c6231397c51500bd44c1c3d3f83f19
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Apr 2 10:50:33 2012 +0200

    s3: Notifies should never time out
    
    Autobuild-User: Volker Lendecke <vl at samba.org>
    Autobuild-Date: Mon Apr  2 12:31:17 CEST 2012 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/libsmb/clifile.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 48a0636..1a67bcd 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -4945,6 +4945,7 @@ struct tevent_req *cli_notify_send(TALLOC_CTX *mem_ctx,
 {
 	struct tevent_req *req, *subreq;
 	struct cli_notify_state *state;
+	unsigned old_timeout;
 
 	req = tevent_req_create(mem_ctx, &state, struct cli_notify_state);
 	if (req == NULL) {
@@ -4955,6 +4956,11 @@ struct tevent_req *cli_notify_send(TALLOC_CTX *mem_ctx,
 	SSVAL(state->setup, 4, fnum);
 	SSVAL(state->setup, 6, recursive);
 
+	/*
+	 * Notifies should not time out
+	 */
+	old_timeout = cli_set_timeout(cli, 0);
+
 	subreq = cli_trans_send(
 		state,			/* mem ctx. */
 		ev,			/* event ctx. */
@@ -4974,6 +4980,8 @@ struct tevent_req *cli_notify_send(TALLOC_CTX *mem_ctx,
 		0,			/* num data. */
 		0);			/* max returned data. */
 
+	cli_set_timeout(cli, old_timeout);
+
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
 	}


-- 
Samba Shared Repository


More information about the samba-cvs mailing list