From be33c93344452c8db8f471cc449497e00ff836b9 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Mon, 12 Mar 2018 13:32:24 +0100
Subject: Return errors in admin#add-user command response stanza (#2321)

---
 src/mod_configure.erl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/mod_configure.erl b/src/mod_configure.erl
index db0780834..471e2bcdc 100644
--- a/src/mod_configure.erl
+++ b/src/mod_configure.erl
@@ -1528,8 +1528,11 @@ set_form(From, Host, ?NS_ADMINL(<<"add-user">>), _Lang,
     true = lists:member(Server, ?MYHOSTS),
     true = Server == Host orelse
 	     get_permission_level(From) == global,
-    ejabberd_auth:try_register(User, Server, Password),
-    {result, undefined};
+    case ejabberd_auth:try_register(User, Server, Password) of
+	ok -> {result, undefined};
+	{error, exists} -> {error, xmpp:err_conflict()};
+	{error, not_allowed} -> {error, xmpp:err_not_allowed()}
+    end;
 set_form(From, Host, ?NS_ADMINL(<<"delete-user">>),
 	 _Lang, XData) ->
     AccountStringList = get_values(<<"accountjids">>,
-- 
cgit v1.2.3