stable to default

rabbitmq · Feb 17, 2015 · 9f970d4 · 9f970d4
2 parents 47c3872 + b351675
commit 9f970d4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/rabbit_shovel_parameters.erl b/src/rabbit_shovel_parameters.erl
@@ -117,11 +117,12 @@ validate_uri(Name, Term, User) ->
 validate_params_user(#amqp_params_direct{}, none) ->
     ok;
 validate_params_user(#amqp_params_direct{virtual_host = VHost},
-                     User = #user{username     = Username,
-                                  auth_backend = M}) ->
-    case rabbit_vhost:exists(VHost) andalso M:check_vhost_access(User, VHost) of
-        true  -> ok;
-        false -> {error, "user \"~s\" may not connect to vhost \"~s\"",
+                     User = #user{username = Username}) ->
+    case rabbit_vhost:exists(VHost) andalso
+        (catch rabbit_access_control:check_vhost_access(
+                 User, VHost, undefined)) of
+        ok -> ok;
+        _  -> {error, "user \"~s\" may not connect to vhost \"~s\"",
                   [Username, VHost]}
     end;
 validate_params_user(#amqp_params_network{}, _User) ->

diff --git a/test/src/rabbit_shovel_test_dyn.erl b/test/src/rabbit_shovel_test_dyn.erl
@@ -257,7 +257,7 @@ invalid_param(Value) -> invalid_param(Value, none).
 valid_param(Value) -> valid_param(Value, none).
 
 lookup_user(Name) ->
-    {ok, User} = rabbit_auth_backend_internal:check_user_login(Name, []),
+    {ok, User} = rabbit_access_control:check_user_login(Name, []),
     User.
 
 clear_param(Name) ->