Attachment 153752 Details for Bug 198262 – Add timeout option, stop extracting source4/

[patch] Add timeout option, stop extracting source4/

samba36-timeout-patch.diff (text/plain), 2.13 KB, created by Mikhail T. on 2015-03-03 23:18:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail T.

Created: 2015-03-03 23:18:40 UTC

Size: 2.13 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 380385)
>+++ Makefile	(working copy)
>@@ -18,6 +18,7 @@
> # Additional patches from Sernet.de
> PATCH_STRIP=		-p1
> EXTRA_PATCHES=		${PATCHDIR}/sernet.patch
>+EXTRACT_AFTER_ARGS=	--exclude source4
> 
> SAMBA_BASENAME=		samba
> CPE_VENDOR=		samba
>Index: files/patch-timeout
>===================================================================
>--- files/patch-timeout	(revision 0)
>+++ files/patch-timeout	(working copy)
>@@ -0,0 +1,63 @@
>+Obtained from:
>+
>+ http://lists.samba.org/archive/samba-technical/2009-January/062964.html
>+--- ./source3/client/client.c	2009-01-27 15:56:44.000000000 +0000
>++++ ./source3/client/client.c	2009-01-27 15:56:49.000000000 +0000
>+@@ -44,6 +44,9 @@
>+ 
>+ static int io_bufsize = 524288;
>+ 
>++/* client timeout */
>++static int timeout = 20000;
>++
>+ static int name_type = 0x20;
>+ extern int max_protocol;
>+ 
>+@@ -4055,6 +4058,7 @@
>+ 		if (!cli) {
>+ 			return 1;
>+ 		}
>++		cli_set_timeout(cli, timeout);
>+ 	}
>+ 
>+ 	while (cmd[0] != '\0')    {
>+@@ -4516,6 +4520,7 @@
>+ 	if (!cli) {
>+ 		return 1;
>+ 	}
>++	cli_set_timeout(cli, timeout);
>+ 
>+ 	if (base_directory && *base_directory) {
>+ 		rc = do_cd(base_directory);
>+@@ -4547,6 +4552,7 @@
>+ 			query_host, "IPC$", true, smb_encrypt);
>+ 	if (!cli)
>+ 		return 1;
>++	cli_set_timeout(cli, timeout);
>+ 
>+ 	browse_host(true);
>+ 
>+@@ -4571,6 +4577,7 @@
>+ 		d_printf("NetBIOS over TCP disabled -- no workgroup available\n");
>+ 		return 1;
>+ 	}
>++	cli_set_timeout(cli, timeout);
>+ 
>+ 	list_servers(lp_workgroup());
>+ 
>+@@ -4593,6 +4600,7 @@
>+ 			desthost, service, true, smb_encrypt);
>+ 		if (!cli)
>+ 			return 1;
>++		cli_set_timeout(cli, timeout);
>+ 	}
>+ 
>+ 	recurse=true;
>+@@ -4698,6 +4706,7 @@
>+ 		{ "port", 'p', POPT_ARG_INT, &port, 'p', "Port to connect to", "PORT" },
>+ 		{ "grepable", 'g', POPT_ARG_NONE, NULL, 'g', "Produce grepable output" },
>+                 { "browse", 'B', POPT_ARG_NONE, NULL, 'B', "Browse SMB servers using DNS" },
>++		{ "timeout", 0, POPT_ARG_INT, &timeout, 0, "Set the response timeout", "MILLISECONDS" },
>+ 		POPT_COMMON_SAMBA
>+ 		POPT_COMMON_CONNECTION
>+ 		POPT_COMMON_CREDENTIALS
>

Flags:

koobs: maintainer-approval? (timur)

Actions: View | Diff

Attachments on bug 198262: 153752