From: Volker Lendecke <vl@samba.org>
Date: Wed, 29 Jul 2009 08:30:52 +0000 (-0400)
Subject: Fix unqualified "net join"
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9509763346de5e587a098a90e33a5e38d6d00a78;p=thirdparty%2Fsamba.git

Fix unqualified "net join"

Kai, please check!

Fixes bug #6585.

Thanks,

Volker
(cherry picked from commit d8543da9dad3286cd330b98374405edb9f976e77)
(cherry picked from commit bf7d1758a77a462d9b30cc2549a960736884ee32)
---

diff --git a/source/utils/net_join.c b/source/utils/net_join.c
index 98188aae5fd..8d4d8c3e520 100644
--- a/source/utils/net_join.c
+++ b/source/utils/net_join.c
@@ -34,10 +34,7 @@ int net_join_usage(struct net_context *c, int argc, const char **argv)
 
 int net_join(struct net_context *c, int argc, const char **argv)
 {
-	if (argc < 1)
-		return net_join_usage(c, argc, argv);
-
-	if (StrCaseCmp(argv[0], "HELP") == 0) {
+	if ((argc > 0) && (StrCaseCmp(argv[0], "HELP") == 0)) {
 		net_join_usage(c, argc, argv);
 		return 0;
 	}