diff options
| author | Badlop <badlop@process-one.net> | 2016-04-15 15:35:57 +0200 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2016-04-15 15:35:57 +0200 |
| commit | e5e4f39c016b86a9dc3936218e44c221430e786c (patch) | |
| tree | eb43f6a51145c9bf8a52b35a589e6bb50df312b2 | |
| parent | Clean mod_carboncopy.erl from DB specific code (diff) | |
Remove --auth in ejabberd_ctl.erl as it's useless, still useful for mod_rest
| -rw-r--r-- | src/ejabberd_ctl.erl | 3 | ||||
| -rw-r--r-- | tools/ejabberdctl.bc | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/ejabberd_ctl.erl b/src/ejabberd_ctl.erl index 7cacc3bb..bb16e91e 100644 --- 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 index 72a5356f..3a63e29f 100644 --- 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 "" |