[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5343-g9509763

[Karolin Seeger]

The branch, v3-3-test has been updated
       via  9509763346de5e587a098a90e33a5e38d6d00a78 (commit)
      from  a01f0a4025d382c1bc82f4992ea4566db4df3818 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 9509763346de5e587a098a90e33a5e38d6d00a78
Author: Volker Lendecke <v...@samba.org>
Date:   Wed Jul 29 04:30:52 2009 -0400

    Fix unqualified "net join"
    
    Kai, please check!
    
    Fixes bug #6585.
    
    Thanks,
    
    Volker
    (cherry picked from commit d8543da9dad3286cd330b98374405edb9f976e77)
    (cherry picked from commit bf7d1758a77a462d9b30cc2549a960736884ee32)

-----------------------------------------------------------------------

Summary of changes:
 source/utils/net_join.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/utils/net_join.c b/source/utils/net_join.c
index 98188aa..8d4d8c3 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;
        }


-- 
Samba Shared Repository