Remove --auth in ejabberd_ctl.erl as it's useless, still useful for m…

…od_rest
processone · Apr 15, 2016 · e5e4f39 · e5e4f39
1 parent 222572b
commit e5e4f39
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/ejabberd_ctl.erl b/src/ejabberd_ctl.erl
@@ -504,8 +504,7 @@ print_usage(HelpMode, MaxC, ShCode, Version) ->
 	get_list_ctls(),
 
     print(
-       ["Usage: ", ?B("ejabberdctl"), " [--no-timeout] [--node ", ?U("nodename"), "] [--version ", ?U("api_version"), "] [--auth ",
-	?U("user"), " ", ?U("host"), " ", ?U("password"), "] ",
+       ["Usage: ", ?B("ejabberdctl"), " [--no-timeout] [--node ", ?U("nodename"), "] [--version ", ?U("api_version"), "] ",
 	?U("command"), " [", ?U("options"), "]\n"
 	"\n"
 	"Available commands in this ejabberd node:\n"], []),

diff --git a/tools/ejabberdctl.bc b/tools/ejabberdctl.bc
@@ -42,7 +42,7 @@ _ejabberdctl()
         ejabberdctl)
             # This clause matches even when calling `/sbin/ejabberdctl` thanks to the ##*/ in the case
             get_help
-            COMPREPLY=($(compgen -W "--node --auth ${startpars} ${startcoms} ${runningcommands}" -- $cur))
+            COMPREPLY=($(compgen -W "--node ${startpars} ${startcoms} ${runningcommands}" -- $cur))
             return 0
             ;;
         start|live)
@@ -75,7 +75,7 @@ _ejabberdctl()
             prev2="${COMP_WORDS[COMP_CWORD-2]}"
             get_help
             if [[ "$prev2" == --* ]]; then
-                COMPREPLY=($(compgen -W "--node --auth ${startpars} ${startcoms} ${runningcommands}" -- $cur))
+                COMPREPLY=($(compgen -W "--node ${startpars} ${startcoms} ${runningcommands}" -- $cur))
             else
                 if [[ $ISRUNNING == 1 ]]; then
                     echo ""