net: Don't try to look up a server if net time is called with a command.
authorKai Blin <kai@samba.org>
Sun, 18 May 2008 22:33:02 +0000 (00:33 +0200)
committerKai Blin <kai@samba.org>
Tue, 10 Jun 2008 07:46:03 +0000 (09:46 +0200)
(This used to be commit 37ef7c28163a5c538f325729855ec47ef6fac6bd)

source3/utils/net_time.c

index 73f0315b1d55530dc6132ed7434bd3b0eeb7a6d1..f8eb2b45a086f38cde667419bc1b0a4cb23b74f7 100644 (file)
@@ -19,7 +19,6 @@
 #include "includes.h"
 #include "utils/net.h"
 
 #include "includes.h"
 #include "utils/net.h"
 
-
 /*
   return the time on a server. This does not require any authentication
 */
 /*
   return the time on a server. This does not require any authentication
 */
@@ -169,9 +168,14 @@ int net_time(struct net_context *c, int argc, const char **argv)
                {"SYSTEM", net_time_system},
                {"SET", net_time_set},
                {"ZONE", net_time_zone},
                {"SYSTEM", net_time_system},
                {"SET", net_time_set},
                {"ZONE", net_time_zone},
+               {"HELP", net_time_usage},
                {NULL, NULL}
        };
 
                {NULL, NULL}
        };
 
+       if (argc != 0) {
+               return net_run_function(c, argc, argv, func, net_time_usage);
+       }
+
        if (!c->opt_host && !c->opt_have_ip &&
            !find_master_ip(c->opt_target_workgroup, &c->opt_dest_ip)) {
                d_fprintf(stderr, "Could not locate a time server.  Try "\
        if (!c->opt_host && !c->opt_have_ip &&
            !find_master_ip(c->opt_target_workgroup, &c->opt_dest_ip)) {
                d_fprintf(stderr, "Could not locate a time server.  Try "\
@@ -180,10 +184,6 @@ int net_time(struct net_context *c, int argc, const char **argv)
                return -1;
        }
 
                return -1;
        }
 
-       if (argc != 0) {
-               return net_run_function(c, argc, argv, func, net_time_usage);
-       }
-
        /* default - print the time */
        t = cli_servertime(c->opt_host, c->opt_have_ip? &c->opt_dest_ip : NULL,
                           NULL);
        /* default - print the time */
        t = cli_servertime(c->opt_host, c->opt_have_ip? &c->opt_dest_ip : NULL,
                           NULL);