r23571: Fix, parsing of multi byte share names.
authorSimo Sorce <idra@samba.org>
Thu, 21 Jun 2007 17:05:59 +0000 (17:05 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 17:23:30 +0000 (12:23 -0500)
Thanks to SATOH Fumiyasu
Fixes 4720

Jerry,
this is a showstopper for 3.0.25b, please grab it into
SAMBA_3_0_RELEASE before cuting the tarballs.

Simo.

source/client/client.c

index 35716ab13cb4017982ef0db2b932e226ac2beda3..721fa831561292192b129ffb0e83fce2a07af52d 100644 (file)
@@ -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 );