Make the -L option to smbclient slightly less gross:
authorMartin Pool <mbp@samba.org>
Mon, 21 Jan 2002 06:42:45 +0000 (06:42 +0000)
committerMartin Pool <mbp@samba.org>
Mon, 21 Jan 2002 06:42:45 +0000 (06:42 +0000)
  smbclient -L //nautilus1/

should definitely not say "unknown host "nautilus1/".  Sheesh.
(This used to be commit 1cd431b8f17e5ac394436d31f64032387ca11930)

source3/client/client.c

index eb9750299b76c3ce0726df47c20f60eb324a56d8..9e9135f2d6bb8894ec2448b0697a54357a502541 100644 (file)
@@ -2531,6 +2531,27 @@ static int do_message_op(void)
 }
 
 
+/**
+ * Process "-L hostname" option.
+ *
+ * We don't actually do anything yet -- we just stash the name in a
+ * global variable and do the query when all options have been read.
+ **/
+static void remember_query_host(const char *arg,
+                               pstring query_host)
+{
+       char *slash;
+       
+       while (*arg == '\\' || *arg == '/')
+               arg++;
+       pstrcpy(query_host, arg);
+       if ((slash = strchr(query_host, '/'))
+           || (slash = strchr(query_host, '\\'))) {
+               *slash = 0;
+       }
+}
+
+
 /****************************************************************************
   main program
 ****************************************************************************/
@@ -2811,10 +2832,7 @@ static int do_message_op(void)
                        break;
 
                case 'L':
-                       p = optarg;
-                       while(*p == '\\' || *p == '/')
-                               p++;
-                       pstrcpy(query_host,p);
+                       remember_query_host(optarg, query_host);
                        break;
                case 't':
                        pstrcpy(term_code, optarg);