diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-11-24 12:00:42 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-11-24 12:00:42 +0100 |
| commit | bfd14dd7ff1a7eb28c00a44d5d52887f42cd603d (patch) | |
| tree | c3aa531499314917188806a073ef2fde590f4c1e /include | |
| parent | 1bd0fa11a08e311718d0c0162ab38aa646068790 (diff) | |
| parent | beb8e52c3648c06340c4c1d6b573a2570d4ee0dd (diff) | |
| download | rabbitmq-server-git-bfd14dd7ff1a7eb28c00a44d5d52887f42cd603d.tar.gz | |
Merge branch 'stable' into rabbitmq-management-236
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit_cli.hrl | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/rabbit_cli.hrl b/include/rabbit_cli.hrl index b1cf41261f..53be9fcda0 100644 --- a/include/rabbit_cli.hrl +++ b/include/rabbit_cli.hrl @@ -31,6 +31,12 @@ -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}). @@ -48,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. |