diff options
| -rw-r--r-- | source3/client/client.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index 35716ab13c..721fa83156 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -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 ); |