From 95e96cc346ef1115baf1dc6e328a005277f36245 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Wed, 23 Dec 2009 16:09:33 +0000
Subject: [PATCH] Fix error message when register is forbidden by ACL
 (EJAB-803)

SVN Revision: 2825
---
 src/mod_register.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mod_register.erl b/src/mod_register.erl
index dbb2e9c80..2e9f6d4f1 100644
--- a/src/mod_register.erl
+++ b/src/mod_register.erl
@@ -210,7 +210,7 @@ try_register(User, Server, Password, Source, Lang) ->
 	    Access = gen_mod:get_module_opt(Server, ?MODULE, access, all),
 	    case acl:match_rule(Server, Access, JID) of
 		deny ->
-		    {error, 'conflict'};
+		    {error, 'forbidden'};
 		allow ->
 		    case check_timeout(Source) of
 			true ->