aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2018-03-12 13:32:24 +0100
committerBadlop <badlop@process-one.net>2018-03-12 13:33:44 +0100
commitbe33c93344452c8db8f471cc449497e00ff836b9 (patch)
tree94058eb802880df1b53ab3ac8c8ccc94988f7dee /src
parentIntroduce force_node_config for mod_pubsub (diff)
Return errors in admin#add-user command response stanza (#2321)
Diffstat (limited to 'src')
-rw-r--r--src/mod_configure.erl7
1 files changed, 5 insertions, 2 deletions
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">>,