diff options
| author | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2016-10-12 16:14:36 +0200 |
|---|---|---|
| committer | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2016-10-12 16:14:36 +0200 |
| commit | fdd9f295d8b33a0774b3fa1f9753ff044fcfee15 (patch) | |
| tree | e9e28f1d77ccf1cd970f23ce378319546282ec30 /include | |
| parent | 471e1dc702d0af4419119feb443a629ea8f3b8b9 (diff) | |
| parent | ae67c3e121322f70a10359675786adb4df7baddb (diff) | |
| download | rabbitmq-server-git-fdd9f295d8b33a0774b3fa1f9753ff044fcfee15.tar.gz | |
Merge branch 'stable'
Conflicts:
include/rabbit_cli.hrl
src/rabbit.erl
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit_cli.hrl | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/rabbit_cli.hrl b/include/rabbit_cli.hrl index 19cae2fc0a..53be9fcda0 100644 --- a/include/rabbit_cli.hrl +++ b/include/rabbit_cli.hrl @@ -31,6 +31,13 @@ -define(ONLINE_OPT, "--online"). -define(LOCAL_OPT, "--local"). +-define(DECODE_OPT, "--decode"). +-define(CIPHER_OPT, "--cipher"). +-define(HASH_OPT, "--hash"). +-define(ITERATIONS_OPT, "--iterations"). +-define(LIST_CIPHERS_OPT, "--list-ciphers"). +-define(LIST_HASHES_OPT, "--list-hashes"). + -define(NODE_DEF(Node), {?NODE_OPT, {option, Node}}). -define(QUIET_DEF, {?QUIET_OPT, flag}). -define(VHOST_DEF, {?VHOST_OPT, {option, "/"}}). @@ -47,6 +54,13 @@ -define(OFFLINE_DEF, {?OFFLINE_OPT, flag}). -define(ONLINE_DEF, {?ONLINE_OPT, flag}). -define(LOCAL_DEF, {?LOCAL_OPT, flag}). +-define(DECODE_DEF, {?DECODE_OPT, flag}). +-define(CIPHER_DEF, {?CIPHER_OPT, {option, atom_to_list(rabbit_pbe:default_cipher())}}). +-define(HASH_DEF, {?HASH_OPT, {option, atom_to_list(rabbit_pbe:default_hash())}}). +-define(ITERATIONS_DEF, {?ITERATIONS_OPT, {option, integer_to_list(rabbit_pbe:default_iterations())}}). +-define(LIST_CIPHERS_DEF, {?LIST_CIPHERS_OPT, flag}). +-define(LIST_HASHES_DEF, {?LIST_HASHES_OPT, flag}). + %% Subset of standartized exit codes from sysexits.h, see %% https://github.com/rabbitmq/rabbitmq-server/issues/396 for discussion. |