# HG changeset patch
# User Waqas Hussain <waqas20@gmail.com>
# Date 1254487913 -18000
# Node ID e9500c4994f3836fd9b9d78e869b9beb36c582b7
# Parent  5da0e3b1f8479aaff60b66742dfe0b36c9cea271# Parent  5ef1eea887cabfe6ba0c32638fccbd47d9820725
Merge with 0.5

diff -r 5da0e3b1f847 -r e9500c4994f3 plugins/mod_register.lua
--- a/plugins/mod_register.lua	Wed Sep 30 11:06:02 2009 +0100
+++ b/plugins/mod_register.lua	Fri Oct 02 17:51:53 2009 +0500
@@ -118,19 +118,18 @@
 				if username and password then
 					-- Check that the user is not blacklisted or registering too often
 					if blacklisted_ips[session.ip] or (whitelist_only and not whitelisted_ips[session.ip]) then
-							session.send(st.error_reply(stanza, "cancel", "not-acceptable"));
-							return;
+						session.send(st.error_reply(stanza, "cancel", "not-acceptable", "You are not allowed to register an account."));
+						return;
 					elseif min_seconds_between_registrations and not whitelisted_ips[session.ip] then
 						if not recent_ips[session.ip] then
 							recent_ips[session.ip] = { time = os_time(), count = 1 };
 						else
-						
 							local ip = recent_ips[session.ip];
 							ip.count = ip.count + 1;
 							
 							if os_time() - ip.time < min_seconds_between_registrations then
 								ip.time = os_time();
-								session.send(st.error_reply(stanza, "cancel", "not-acceptable"));
+								session.send(st.error_reply(stanza, "wait", "not-acceptable"));
 								return;
 							end
 							ip.time = os_time();
@@ -139,18 +138,21 @@
 					-- FIXME shouldn't use table.concat
 					username = nodeprep(table.concat(username));
 					password = table.concat(password);
-					if usermanager_user_exists(username, session.host) then
-						session.send(st.error_reply(stanza, "cancel", "conflict"));
+					local host = module.host;
+					if not username then
+						session.send(st.error_reply(stanza, "modify", "not-acceptable", "The requested username is invalid."));
+					elseif usermanager_user_exists(username, host) then
+						session.send(st.error_reply(stanza, "cancel", "conflict", "The requested username already exists."));
 					else
-						if usermanager_create_user(username, password, session.host) then
+						if usermanager_create_user(username, password, host) then
 							session.send(st.reply(stanza)); -- user created!
-							module:log("info", "User account created: %s@%s", username, session.host);
+							module:log("info", "User account created: %s@%s", username, host);
 							module:fire_event("user-registered", { 
-								username = username, host = session.host, source = "mod_register",
+								username = username, host = host, source = "mod_register",
 								session = session });
 						else
 							-- TODO unable to write file, file may be locked, etc, what's the correct error?
-							session.send(st.error_reply(stanza, "wait", "internal-server-error"));
+							session.send(st.error_reply(stanza, "wait", "internal-server-error", "Failed to write data to disk."));
 						end
 					end
 				else
diff -r 5da0e3b1f847 -r e9500c4994f3 util-src/encodings.c
--- a/util-src/encodings.c	Wed Sep 30 11:06:02 2009 +0100
+++ b/util-src/encodings.c	Fri Oct 02 17:51:53 2009 +0500
@@ -108,7 +108,6 @@
 				break;
 		}
 	}
-	return 0;
 }
 
 static const luaL_Reg Reg_base64[] =
@@ -124,14 +123,15 @@
 
 static int stringprep_prep(lua_State *L, const Stringprep_profile *profile)
 {
+	size_t len;
+	const char *s;
+	char string[1024];
+	int ret;
 	if(!lua_isstring(L, 1)) {
 		lua_pushnil(L);
 		return 1;
 	}
-	size_t len;
-	const char *s = lua_tolstring(L, 1, &len);
-	char string[1024];
-	int ret;
+	s = lua_tolstring(L, 1, &len);
 	if (len >= 1024) {
 		lua_pushnil(L);
 		return 1; // TODO return error message
@@ -167,6 +167,7 @@
 /***************** IDNA *****************/
 
 #include <idna.h>
+#include <idn-free.h>
 
 static int Lidna_to_ascii(lua_State *L)		/** idna.to_ascii(s) */
 {