Attachment 2776 Details for Bug 4720 – Patch: use mb functions after lp_load

[patch] Patch: use mb functions after lp_load

samba-3.0.25-smbclient-mbshare.patch (text/plain), 1.72 KB, created by SATOH Fumiyasu on 2007-06-21 05:55:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: SATOH Fumiyasu

Created: 2007-06-21 05:55:22 UTC

Size: 1.72 KB

patch

obsolete

>Index: SAMBA_3_0/source/client/client.c
>===================================================================
>--- SAMBA_3_0/source/client/client.c	(revision 23560)
>+++ SAMBA_3_0/source/client/client.c	(working copy)
>@@ -3970,14 +3970,6 @@ static int do_message_op(void)
> 		/* if the service has not yet been specified lets see if it is available in the popt stack */
> 		if (!service_opt && poptPeekArg(pc)) {
> 			pstrcpy(service, poptGetArg(pc));
>-			/* Convert any '/' characters in the service name to '\' characters */
>-			string_replace(service, '/','\\');
>-
>-			if (count_chars(service,'\\') < 3) {
>-				d_printf("\n%s: Not enough '\\' characters in service\n",service);
>-				poptPrintUsage(pc, stderr, 0);
>-				exit(1);
>-			}
> 			service_opt = True;
> 		}
> 
>@@ -4065,14 +4057,6 @@ static int do_message_op(void)
> 	/* if the service has not yet been specified lets see if it is available in the popt stack */
> 	if (!service_opt && poptPeekArg(pc)) {
> 		pstrcpy(service, poptGetArg(pc));
>-		/* Convert any '/' characters in the service name to '\' characters */
>-		string_replace(service, '/','\\');
>-
>-		if (count_chars(service,'\\') < 3) {
>-			d_printf("\n%s: Not enough '\\' characters in service\n",service);
>-			poptPrintUsage(pc, stderr, 0);
>-			exit(1);
>-		}
> 		service_opt = True;
> 	}
> 
>@@ -4111,6 +4095,16 @@ static int do_message_op(void)
> 	}
> 	
> 	load_interfaces();
>+
>+	if (service_opt) {
>+		/* Convert any '/' characters in the service name to '\' characters */
>+		string_replace(service, '/','\\');
>+		if (count_chars(service,'\\') < 3) {
>+			d_printf("\n%s: Not enough '\\' characters in service\n",service);
>+			poptPrintUsage(pc, stderr, 0);
>+			exit(1);
>+		}
>+	}
> 	
> 	if ( strlen(new_workgroup) != 0 )
> 		set_global_myworkgroup( new_workgroup );

Actions: View

Attachments on bug 4720: 2776