From d09721301e18ccdd03a6718d9aeeddc94d11de1c Mon Sep 17 00:00:00 2001
From: Feng <ery.lee@gmail.com>
Date: Wed, 4 Nov 2015 10:22:49 +0800
Subject: [PATCH] conflict

---
 src/emqttd_client.erl          |  2 +-
 src/emqttd_protocol.erl        |  2 +-
 src/emqttd_ws_client.erl       |  2 +-
 test/emqttd_auth_dashboard.erl | 14 ++++++++++++++
 4 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 test/emqttd_auth_dashboard.erl

diff --git a/src/emqttd_client.erl b/src/emqttd_client.erl
index 3ad5a3728..a684737a5 100644
--- a/src/emqttd_client.erl
+++ b/src/emqttd_client.erl
@@ -170,7 +170,7 @@ handle_info({redeliver, {?PUBREL, PacketId}}, State) ->
 
 handle_info({shutdown, conflict, {ClientId, NewPid}}, State) ->
     ?LOG(warning, "clientid '~s' conflict with ~p", [ClientId, NewPid], State),
-    shutdown(confict, State);
+    shutdown(conflict, State);
 
 handle_info(activate_sock, State) ->
     noreply(run_socket(State#client_state{conn_state = running}));
diff --git a/src/emqttd_protocol.erl b/src/emqttd_protocol.erl
index e9395ed3f..33571e213 100644
--- a/src/emqttd_protocol.erl
+++ b/src/emqttd_protocol.erl
@@ -282,7 +282,7 @@ redeliver({?PUBREL, PacketId}, State) ->
 shutdown(_Error, #proto_state{client_id = undefined}) ->
     ignore;
 
-shutdown(confict, #proto_state{client_id = ClientId}) ->
+shutdown(conflict, #proto_state{client_id = ClientId}) ->
     emqttd_cm:unregister(ClientId);
 
 shutdown(Error, State = #proto_state{client_id = ClientId, will_msg = WillMsg}) ->
diff --git a/src/emqttd_ws_client.erl b/src/emqttd_ws_client.erl
index 1d02ab46c..cb9a49e74 100644
--- a/src/emqttd_ws_client.erl
+++ b/src/emqttd_ws_client.erl
@@ -196,7 +196,7 @@ handle_info({redeliver, {?PUBREL, PacketId}}, State) ->
 
 handle_info({shutdown, conflict, {ClientId, NewPid}}, State = #wsclient_state{request = Req}) ->
     ?WSLOG(warning, "clientid '~s' conflict with ~p", [ClientId, NewPid], Req),
-    shutdown(confict, State);
+    shutdown(conflict, State);
 
 handle_info({keepalive, start, Interval}, State = #wsclient_state{request = Req}) ->
     ?WSLOG(debug, "Keepalive at the interval of ~p", [Interval], Req),
diff --git a/test/emqttd_auth_dashboard.erl b/test/emqttd_auth_dashboard.erl
new file mode 100644
index 000000000..ea9aca7e1
--- /dev/null
+++ b/test/emqttd_auth_dashboard.erl
@@ -0,0 +1,14 @@
+
+-module(emqttd_auth_dashboard).
+
+%% Auth callbacks
+-export([init/1, check/3, description/0]).
+
+init(Opts) ->
+    {ok, Opts}.
+
+check(_Client, _Password, _Opts) ->
+    allow.
+
+description() ->
+    "Test emqttd_auth_dashboard Mod".