[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 1941ba51b4b528d2ed0c53f692a67ddb1ab64403

[Michael Adam]

The branch, v3-4-ctdb has been updated
       via  1941ba51b4b528d2ed0c53f692a67ddb1ab64403 (commit)
      from  7e0cdb8161a1d8d9187f8d5a5baf83002ea0bd77 (commit)

http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb


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

    Fix unqualified "net join"
    
    Kai, please check!
    
    Thanks,
    
    Volker
    
    Signed-off-by: Michael Adam <ob...@samba.org>

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

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


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_join.c b/source3/utils/net_join.c
index 98188aa..8d4d8c3 100644
--- a/source3/utils/net_join.c
+++ b/source3/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-CTDB repository