summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Cogoluègnes <acogoluegnes@gmail.com>2016-12-05 16:59:37 +0100
committerArnaud Cogoluègnes <acogoluegnes@gmail.com>2016-12-05 16:59:37 +0100
commitd3d1cfd734c230974fafcc1db24652ec49c057c8 (patch)
tree208c9d8f96e00636152a379abafb8a90d5e71f57
parent87995fe675e7a618167d2edcb78d0fb2c6dc2474 (diff)
downloadrabbitmq-server-git-d3d1cfd734c230974fafcc1db24652ec49c057c8.tar.gz
Coerce default_* configuration entries to binaries
Namely default_user, default_pass, default_vhost, default_permissions. Fixes #1050
-rw-r--r--src/rabbit.erl27
1 files changed, 19 insertions, 8 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index e5a6f09c56..729e05aab2 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -777,14 +777,25 @@ insert_default_data() ->
{ok, DefaultVHost} = application:get_env(default_vhost),
{ok, [DefaultConfigurePerm, DefaultWritePerm, DefaultReadPerm]} =
application:get_env(default_permissions),
- ok = rabbit_vhost:add(DefaultVHost),
- ok = rabbit_auth_backend_internal:add_user(DefaultUser, DefaultPass),
- ok = rabbit_auth_backend_internal:set_tags(DefaultUser, DefaultTags),
- ok = rabbit_auth_backend_internal:set_permissions(DefaultUser,
- DefaultVHost,
- DefaultConfigurePerm,
- DefaultWritePerm,
- DefaultReadPerm),
+
+ DefaultUserBin = rabbit_data_coercion:to_binary(DefaultUser),
+ DefaultPassBin = rabbit_data_coercion:to_binary(DefaultPass),
+ DefaultVHostBin = rabbit_data_coercion:to_binary(DefaultVHost),
+ DefaultConfigurePermBin = rabbit_data_coercion:to_binary(DefaultConfigurePerm),
+ DefaultWritePermBin = rabbit_data_coercion:to_binary(DefaultWritePerm),
+ DefaultReadPermBin = rabbit_data_coercion:to_binary(DefaultReadPerm),
+
+ ok = rabbit_vhost:add(DefaultVHostBin),
+ ok = rabbit_auth_backend_internal:add_user(
+ DefaultUserBin,
+ DefaultPassBin
+ ),
+ ok = rabbit_auth_backend_internal:set_tags(DefaultUserBin,DefaultTags),
+ ok = rabbit_auth_backend_internal:set_permissions(DefaultUserBin,
+ DefaultVHostBin,
+ DefaultConfigurePermBin,
+ DefaultWritePermBin,
+ DefaultReadPermBin),
ok.
%%---------------------------------------------------------------------------