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 98188aae5fdb91a7548ae68ef9ce5470e4b3d221..8d4d8c3e520dd0af9a19fa4895ed98c637d3dfe2 100644 (file)
--- 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;
        }