[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  d447184... If the timeout has been set to zero, don't register an end time.
      from  902a5e5... wbclient/wbclient.c - fix a typo

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


- Log -----------------------------------------------------------------
commit d447184ca863fd3effa2585a80704468572893b7
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Mar 30 13:45:53 2010 -0700

    If the timeout has been set to zero, don't register an end time.
    
    The caller doesn't want a timeout.
    
    Jeremy.

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

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


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 2f1f45c..4518518 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -424,9 +424,11 @@ struct tevent_req *cli_smb_req_create(TALLOC_CTX *mem_ctx,
 	}
 	state->iov_count = iov_count + 3;
 
-	endtime = timeval_current_ofs(0, cli->timeout * 1000);
-	if (!tevent_req_set_endtime(result, ev, endtime)) {
-		tevent_req_nomem(NULL, result);
+	if (cli->timeout) {
+		endtime = timeval_current_ofs(0, cli->timeout * 1000);
+		if (!tevent_req_set_endtime(result, ev, endtime)) {
+			tevent_req_nomem(NULL, result);
+		}
 	}
 	return result;
 }


-- 
Samba Shared Repository