summaryrefslogtreecommitdiff
path: root/src/ejabberd_admin.erl
diff options
context:
space:
mode:
authorMickael Remond <mremond@process-one.net>2016-07-30 11:50:04 +0200
committerMickael Remond <mremond@process-one.net>2016-07-30 11:50:04 +0200
commitfb2603d3cdef98542f479764567b15c9c7777411 (patch)
tree9b8d3a125fe9c7028e2d16cdb1e372c6db9c9e05 /src/ejabberd_admin.erl
parentDo not crash on check when we do not have JID (diff)
Return 409 conflict error code on register if user already exists
Diffstat (limited to 'src/ejabberd_admin.erl')
-rw-r--r--src/ejabberd_admin.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl
index f20aeebf..f40b99ea 100644
--- a/src/ejabberd_admin.erl
+++ b/src/ejabberd_admin.erl
@@ -382,7 +382,7 @@ register(User, Host, Password) ->
{atomic, exists} ->
String = io_lib:format("User ~s@~s already registered at node ~p",
[User, Host, node()]),
- {exists, String};
+ {conflict, String};
{error, Reason} ->
String = io_lib:format("Can't register user ~s@~s at node ~p: ~p",
[User, Host, node(), Reason]),