From: Kai Blin <kai@samba.org>
Date: Sun, 18 May 2008 22:33:02 +0000 (+0200)
Subject: net: Don't try to look up a server if net time is called with a command.
X-Git-Tag: samba-4.0.0alpha6~801^2~1125
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=6e8d46d40df86a8f6c5820852eb1eab95049be41;ds=sidebyside

net: Don't try to look up a server if net time is called with a command.
(This used to be commit 37ef7c28163a5c538f325729855ec47ef6fac6bd)
---

diff --git a/source3/utils/net_time.c b/source3/utils/net_time.c
index 73f0315b1d5..f8eb2b45a08 100644
--- a/source3/utils/net_time.c
+++ b/source3/utils/net_time.c
@@ -19,7 +19,6 @@
 #include "includes.h"
 #include "utils/net.h"
 
-
 /*
   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},
+		{"HELP", net_time_usage},
 		{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 "\
@@ -180,10 +184,6 @@ int net_time(struct net_context *c, int argc, const char **argv)
 		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);