diff options
| author | Jean-Sebastien Pedron <jean-sebastien@rabbitmq.com> | 2014-11-26 17:53:45 +0100 |
|---|---|---|
| committer | Jean-Sebastien Pedron <jean-sebastien@rabbitmq.com> | 2014-11-26 17:53:45 +0100 |
| commit | ad1fd74f41f4cca3b2d456a3d4359ef3b57a5551 (patch) | |
| tree | 7700018ee398a265c1d9456763c0e6ed313f1e69 /src | |
| parent | af62f3f4985257f29cd175535b0b37e36df50157 (diff) | |
| download | rabbitmq-server-git-ad1fd74f41f4cca3b2d456a3d4359ef3b57a5551.tar.gz | |
Drop {refuse, _, _} from rabbit_auth_mechanism:handle_response/2 return values
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_auth_mechanism.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/src/rabbit_auth_mechanism.erl b/src/rabbit_auth_mechanism.erl index 4f771db203..c8e23a75d5 100644 --- a/src/rabbit_auth_mechanism.erl +++ b/src/rabbit_auth_mechanism.erl @@ -36,15 +36,12 @@ %% Another round is needed. Here's the state I want next time. %% {protocol_error, Msg, Args} %% Client got the protocol wrong. Log and die. -%% {refused, Msg, Args} -%% (deprecated) Client failed authentication. Log and die. %% {refused, Username, Msg, Args} %% Client failed authentication. Log and die. -callback handle_response(binary(), any()) -> {'ok', rabbit_types:user()} | {'challenge', binary(), any()} | {'protocol_error', string(), [any()]} | - {'refused', string(), [any()]} | {'refused', rabbit_types:username() | none, string(), [any()]}. -else. diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 364dfc051e..713b18445a 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -1048,10 +1048,6 @@ auth_phase(Response, case AuthMechanism:handle_response(Response, AuthState) of {refused, Username, Msg, Args} -> auth_fail(Username, Msg, Args, Name, State); - {refused, Msg, Args} -> - %% Deprecated: older auth mechanisms don't return the - %% username, even if they reach a stage where they know it. - auth_fail(none, Msg, Args, Name, State); {protocol_error, Msg, Args} -> notify_auth_result(none, user_authentication_failure, Msg, Args, State), |