svn commit: samba r5391 - in branches/SAMBA_4_0/source/libcli/nbt: .

[tridge at samba.org]

Author: tridge
Date: 2005-02-14 06:05:35 +0000 (Mon, 14 Feb 2005)
New Revision: 5391

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5391

Log:
cope with w2k3 getting the timeout wrong in wack replies




Modified:
   branches/SAMBA_4_0/source/libcli/nbt/nbtsocket.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/nbt/nbtsocket.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/nbt/nbtsocket.c	2005-02-14 05:11:23 UTC (rev 5390)
+++ branches/SAMBA_4_0/source/libcli/nbt/nbtsocket.c	2005-02-14 06:05:35 UTC (rev 5391)
@@ -235,9 +235,9 @@
 		   has received our request */
 		req->num_retries   = 0;
 		req->received_wack = True;
-		if (packet->answers[0].ttl != 0) {
-			req->timeout = MIN(packet->answers[0].ttl, 20);
-		}
+		/* although there can be a timeout in the packet, w2k3 screws it up,
+		   so better to set it ourselves */		   
+		req->timeout = lp_parm_int(-1, "nbt", "wack_timeout", 30);
 		req->te = event_add_timed(req->nbtsock->event_ctx, req, 
 					  timeval_current_ofs(req->timeout, 0),
 					  nbt_name_socket_timeout, req);