root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix compile warnings

This commit is contained in:
ash-lshift 2015-07-14 10:47:01 +01:00
parent fabf2614ab
commit 6bc3579023
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deps/rabbitmq_mqtt/src/rabbit_mqtt_processor.erl vendored
View File

@ -461,8 +461,8 @@ creds(User, Pass, SSLLoginName) ->
_ ->
case {Pass =/= undefined, is_binary(DefaultPass), Anon =:= true, SSLLoginName == U} of
{true, _, _, _} -> {U, list_to_binary(Pass)};
{false, _, _, _} -> {U, none};
{false, true, true, _} -> {U, DefaultPass};
{false, _, _, _} -> {U, none};
_ -> {U, none}
end
end.
@ -604,16 +604,16 @@ close_connection(PState = #proc_state{ connection = Connection,
check_publish_or_die(TopicName, Fn, PState) ->
case check_topic_access(TopicName, write, PState) of
ok -> apply(Fn, []);
Other -> {err, unauthorized, PState}
_ -> {err, unauthorized, PState}
end.
check_subscribe_or_die([], Fn, PState) ->
check_subscribe_or_die([], Fn, _) ->
apply(Fn, []);
check_subscribe_or_die([#mqtt_topic{ name = TopicName } | Topics], Fn, PState) ->
case check_topic_access(TopicName, read, PState) of
ok -> apply(Fn, []);
Other -> {err, unauthorized, PState}
ok -> check_subscribe_or_die(Topics, Fn, PState);
_ -> {err, unauthorized, PState}
end.
check_topic_access(TopicName, Access,

2
deps/rabbitmq_mqtt/src/rabbit_mqtt_vhost_event_handler.erl vendored
View File

@ -33,7 +33,7 @@ handle_event({event, vhost_deleted, Info, _, _}, State) ->
Name = pget(name, Info),
rabbit_mqtt_retainer_sup:delete_child(Name),
{ok, State};
handle_event(Event, State) ->
handle_event(_Event, State) ->
{ok, State}.
handle_call(_Request, State) ->