View | Details | Raw Unified | Return to bug 198262
Collapse All | Expand All

(-)Makefile (+1 lines)
Lines 18-23 Link Here
18
# Additional patches from Sernet.de
18
# Additional patches from Sernet.de
19
PATCH_STRIP=		-p1
19
PATCH_STRIP=		-p1
20
EXTRA_PATCHES=		${PATCHDIR}/sernet.patch
20
EXTRA_PATCHES=		${PATCHDIR}/sernet.patch
21
EXTRACT_AFTER_ARGS=	--exclude source4
21
22
22
SAMBA_BASENAME=		samba
23
SAMBA_BASENAME=		samba
23
CPE_VENDOR=		samba
24
CPE_VENDOR=		samba
(-)files/patch-timeout (+63 lines)
Line 0 Link Here
1
Obtained from:
2
3
 http://lists.samba.org/archive/samba-technical/2009-January/062964.html
4
--- ./source3/client/client.c	2009-01-27 15:56:44.000000000 +0000
5
+++ ./source3/client/client.c	2009-01-27 15:56:49.000000000 +0000
6
@@ -44,6 +44,9 @@
7
 
8
 static int io_bufsize = 524288;
9
 
10
+/* client timeout */
11
+static int timeout = 20000;
12
+
13
 static int name_type = 0x20;
14
 extern int max_protocol;
15
 
16
@@ -4055,6 +4058,7 @@
17
 		if (!cli) {
18
 			return 1;
19
 		}
20
+		cli_set_timeout(cli, timeout);
21
 	}
22
 
23
 	while (cmd[0] != '\0')    {
24
@@ -4516,6 +4520,7 @@
25
 	if (!cli) {
26
 		return 1;
27
 	}
28
+	cli_set_timeout(cli, timeout);
29
 
30
 	if (base_directory && *base_directory) {
31
 		rc = do_cd(base_directory);
32
@@ -4547,6 +4552,7 @@
33
 			query_host, "IPC$", true, smb_encrypt);
34
 	if (!cli)
35
 		return 1;
36
+	cli_set_timeout(cli, timeout);
37
 
38
 	browse_host(true);
39
 
40
@@ -4571,6 +4577,7 @@
41
 		d_printf("NetBIOS over TCP disabled -- no workgroup available\n");
42
 		return 1;
43
 	}
44
+	cli_set_timeout(cli, timeout);
45
 
46
 	list_servers(lp_workgroup());
47
 
48
@@ -4593,6 +4600,7 @@
49
 			desthost, service, true, smb_encrypt);
50
 		if (!cli)
51
 			return 1;
52
+		cli_set_timeout(cli, timeout);
53
 	}
54
 
55
 	recurse=true;
56
@@ -4698,6 +4706,7 @@
57
 		{ "port", 'p', POPT_ARG_INT, &port, 'p', "Port to connect to", "PORT" },
58
 		{ "grepable", 'g', POPT_ARG_NONE, NULL, 'g', "Produce grepable output" },
59
                 { "browse", 'B', POPT_ARG_NONE, NULL, 'B', "Browse SMB servers using DNS" },
60
+		{ "timeout", 0, POPT_ARG_INT, &timeout, 0, "Set the response timeout", "MILLISECONDS" },
61
 		POPT_COMMON_SAMBA
62
 		POPT_COMMON_CONNECTION
63
 		POPT_COMMON_CREDENTIALS

Return to bug 198262