Merged the /loginmerge branch (topic:192754)

 * the login server storage, ipban and logging systems have been abstracted and now provide a common interface; the rest has been merged into a single login server core (no more login/login_sql duplicity)
 * storage systems are now added via compiler options (WITH_SQL / WITH_TXT)
 * multiple storage engines can be compiled in at the same time, and the config option account.engine defines which one will be used.
 * due to MySQL autoincrement limitations, accounts with id '0' will not be supported; account IDs from this point on should start from '1'.
 * login_log() functions now again record IP addresses in dotted format, not as 4-byte integers (undo from r6868).
 * removed config options that defined column names in the login table
 * removed `memo` and `error message` columns from login db/savefile
 * moved `loginlog` table to the logs database
 * added sql files upgrade_svn12975.sql and upgrade_svn12975_log.sql
 * due to changes to the login table layout, I added an !optional! sql file (upgrade_svn12975_view.sql) that will provide a certain degree of backwards compatibility with existing software; read the instructions inside carefully!
 * moved third-party includes/libs to a separate directory
 * updated project files / makefiles

Changed the way GM levels are handled
 * removed conf/gm_account.txt
 * added the gm level column to the txt savefile (after 'email' column)
 * gm level information is now transferred along with account data
 
For open problems see bugreport:1889.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13000 54d463be-8e91-2dee-dedb-b68131a5f0ec

63 files changed, 3907 insertions, 14380 deletions

diff --git a/src/char/char.c b/src/char/char.c
index 071e21472..cedf7caa2 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -109,6 +109,7 @@ struct char_session_data {
 	int found_char[MAX_CHARS]; // ids of chars on this account
 	char email[40]; // e-mail (default: a@a.com) by [Yor]
 	time_t expiration_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited)
+	int gmlevel;
 };
 
 int char_id_count = START_CHAR_NUM;
@@ -136,9 +137,6 @@ struct fame_list taekwon_fame_list[MAX_FAME_LIST];
 // Initial position (it's possible to set it in conf file)
 struct point start_point = { 0, 53, 111 };
 
-struct gm_account *gm_account = NULL;
-int GM_num = 0;
-
 // online players by [Yor]
 char online_txt_filename[1024] = "online.txt";
 char online_html_filename[1024] = "online.html";
@@ -162,6 +160,7 @@ struct auth_node {
 	uint32 ip;
 	int sex;
 	time_t expiration_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited)
+	int gmlevel;
 };
 
 static DBMap* auth_db; // int account_id -> struct auth_node*
@@ -344,20 +343,6 @@ int char_log(char *fmt, ...)
 	return 0;
 }
 
-//----------------------------------------------------------------------
-// Determine if an account (id) is a GM account
-// and returns its level (or 0 if it isn't a GM account or if not found)
-//----------------------------------------------------------------------
-int isGM(int account_id)
-{
-	int i;
-
-	for(i = 0; i < GM_num; i++)
-		if (gm_account[i].account_id == account_id)
-			return gm_account[i].level;
-	return 0;
-}
-
 //Search character data from the aid/cid givem
 struct mmo_charstatus* search_character(int aid, int cid)
 {
@@ -1556,7 +1541,8 @@ void create_online_files(void)
 				// displaying the character name
 				if ((online_display_option & 1) || (online_display_option & 64)) { // without/with 'GM' display
 					strcpy(temp, char_dat[j].status.name);
-					l = isGM(char_dat[j].status.account_id);
+					//l = isGM(char_dat[j].status.account_id);
+					l = 0; //FIXME: how to get the gm level?
 					if (online_display_option & 64) {
 						if (l >= online_gm_display_min_level)
 							fprintf(fp, "%-24s (GM) ", temp);
@@ -1892,7 +1878,7 @@ static int char_delete(struct mmo_charstatus *cs)
 static void char_auth_ok(int fd, struct char_session_data *sd)
 {
 	struct online_char_data* character;
-	if (max_connect_user && count_users() >= max_connect_user && isGM(sd->account_id) < gm_allow_level)
+	if (max_connect_user && count_users() >= max_connect_user && sd->gmlevel < gm_allow_level)
 	{
 		// refuse connection (over populated)
 		WFIFOW(fd,0) = 0x6c;
@@ -1999,7 +1985,7 @@ int parse_fromlogin(int fd)
 
 		// acknowledgement of account authentication request
 		case 0x2713:
-			if (RFIFOREST(fd) < 59)
+			if (RFIFOREST(fd) < 60)
 				return 0;
 		{
 			int account_id = RFIFOL(fd,2);
@@ -2008,6 +1994,7 @@ int parse_fromlogin(int fd)
 			bool result = RFIFOB(fd,14);
 			const char* email = (const char*)RFIFOP(fd,15);
 			time_t expiration_time = (time_t)RFIFOL(fd,55);
+			int gmlevel = RFIFOB(fd,59);
 
 			// find the session with this account id
 			ARR_FIND( 0, fd_max, i, session[i] && (sd = (struct char_session_data*)session[i]->session_data) &&
@@ -2021,32 +2008,29 @@ int parse_fromlogin(int fd)
 					WFIFOSET(i,3);
 				} else { // success
 					memcpy(sd->email, email, 40);
-					if (e_mail_check(sd->email) == 0)
-						strncpy(sd->email, "a@a.com", 40); // default e-mail
 					sd->expiration_time = expiration_time;
+					sd->gmlevel = gmlevel;
 					char_auth_ok(i, sd);
 				}
 			}
 		}
-			RFIFOSKIP(fd,59);
+			RFIFOSKIP(fd,60);
 		break;
 
 		// Receiving of an e-mail/time limit from the login-server (answer of a request because a player comes back from map-server to char-server) by [Yor]
 		case 0x2717:
-			if (RFIFOREST(fd) < 50)
+			if (RFIFOREST(fd) < 51)
 				return 0;
-			for(i = 0; i < fd_max; i++) {
-				if (session[i] && (sd = (struct char_session_data*)session[i]->session_data)) {
-					if (sd->account_id == RFIFOL(fd,2)) {
-						memcpy(sd->email, RFIFOP(fd,6), 40);
-						if (e_mail_check(sd->email) == 0)
-							strncpy(sd->email, "a@a.com", 40); // default e-mail
-						sd->expiration_time = (time_t)RFIFOL(fd,46);
-						break;
-					}
-				}
+
+			// find the session with this account id
+			ARR_FIND( 0, fd_max, i, session[i] && (sd = (struct char_session_data*)session[i]->session_data) && sd->account_id == RFIFOL(fd,2) );
+			if( i < fd_max )
+			{
+				memcpy(sd->email, RFIFOP(fd,6), 40);
+				sd->expiration_time = (time_t)RFIFOL(fd,46);
+				sd->gmlevel = RFIFOB(fd,50);
 			}
-			RFIFOSKIP(fd,50);
+			RFIFOSKIP(fd,51);
 		break;
 
 		// login-server alive packet
@@ -2209,7 +2193,7 @@ int parse_fromlogin(int fd)
 			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
 				return 0;
 		{	//Receive account_reg2 registry, forward to map servers.
-			unsigned char buf[ACCOUNT_REG2_NUM*(256+32+2)+16];
+			unsigned char buf[13+ACCOUNT_REG2_NUM*sizeof(struct global_reg)];
 			memcpy(buf,RFIFOP(fd,0), RFIFOW(fd,2));
 //			WBUFW(buf,0) = 0x2b11;
 			WBUFW(buf,0) = 0x3804; //Map server can now receive all kinds of reg values with the same packet. [Skotlex]
@@ -2284,33 +2268,6 @@ int parse_fromlogin(int fd)
 			RFIFOSKIP(fd,11);
 		break;
 
-		// Receiving GM acounts info from login-server (by [Yor])
-		case 0x2732:
-			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
-				return 0;
-		{
-			unsigned char buf[32000]; //FIXME: this will crash
-			if (gm_account != NULL)
-				aFree(gm_account);
-			CREATE(gm_account, struct gm_account, (RFIFOW(fd,2) - 4)/5);
-			GM_num = 0;
-			for (i = 4; i < RFIFOW(fd,2); i = i + 5) {
-				gm_account[GM_num].account_id = RFIFOL(fd,i);
-				gm_account[GM_num].level = (int)RFIFOB(fd,i+4);
-				//printf("GM account: %d -> level %d\n", gm_account[GM_num].account_id, gm_account[GM_num].level);
-				GM_num++;
-			}
-			ShowStatus("From login-server: receiving information of %d GM accounts.\n", GM_num);
-			char_log("From login-server: receiving information of %d GM accounts.\n", GM_num);
-			// send new gm acccounts level to map-servers
-			memcpy(buf, RFIFOP(fd,0), RFIFOW(fd,2));
-			WBUFW(buf,0) = 0x2b15;
-			mapif_sendall(buf, RFIFOW(fd,2));
-
-			RFIFOSKIP(fd,RFIFOW(fd,2));
-		}
-		break;
-
 		// Login server request to kick a character out. [Skotlex]
 		case 0x2734:
 			if (RFIFOREST(fd) < 6)
@@ -2634,15 +2591,6 @@ int parse_frommap(int fd)
 		switch(RFIFOW(fd,0))
 		{
 
-		case 0x2af7: // request from map-server to reload GM accounts. Transmission to login-server
-			if (login_fd > 0) { // don't send request if no login-server
-				WFIFOHEAD(login_fd,2);
-				WFIFOW(login_fd,0) = 0x2709;
-				WFIFOSET(login_fd,2);
-			}
-			RFIFOSKIP(fd,2);
-		break;
-
 		case 0x2afa: // Receiving map names list from the map-server
 			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
 				return 0;
@@ -2844,8 +2792,9 @@ int parse_frommap(int fd)
 			    char_dat[i].status.char_id == RFIFOL(fd,14))
 				break;
 			}
+
 			char_data = i < char_num ? &char_dat[i].status : NULL;
-			//Tell the new map server about this player using Kevin's new auth packet. [Skotlex]
+
 			if (map_fd >= 0 && session[map_fd] && char_data) 
 			{	//Send the map server the auth of this player.
 				struct auth_node* node;
@@ -2856,19 +2805,6 @@ int parse_frommap(int fd)
 				char_data->last_point.y = RFIFOW(fd,22);
 				char_data->sex = RFIFOB(fd,30);
 
-#if 0
-				// the map-server must request it [FlavioJS]
-				WFIFOHEAD(map_fd, 20 + sizeof(struct mmo_charstatus));
-				WFIFOW(map_fd,0) = 0x2afd;
-				WFIFOW(map_fd,2) = 20 + sizeof(struct mmo_charstatus);
-				WFIFOL(map_fd,4) = RFIFOL(fd,2); //Account ID
-				WFIFOL(map_fd,8) = RFIFOL(fd,6); //Login1
-				WFIFOL(map_fd,16) = RFIFOL(fd,10); //Login2
-				WFIFOL(map_fd,12) = (unsigned long)0; //TODO: expiration_time, how do I figure it out right now?
-				memcpy(WFIFOP(map_fd,20), char_data, sizeof(struct mmo_charstatus));
-				WFIFOSET(map_fd, WFIFOW(map_fd,2));
-#endif
-
 				// create temporary auth entry
 				CREATE(node, struct auth_node, 1);
 				node->account_id = RFIFOL(fd,2);
@@ -2959,9 +2895,9 @@ int parse_frommap(int fd)
 
 				if( login_fd <= 0 )
 					result = 3; // 3-login-server offline
-				else
-				if( acc != -1 && isGM(acc) < isGM(account_id) )
-					result = 2; // 2-gm level too low
+//				else
+//				if( acc != -1 && isGM(acc) < isGM(account_id) )
+//					result = 2; // 2-gm level too low
 				else
 				switch( type ) {
 				case 1: // block
@@ -3168,14 +3104,15 @@ int parse_frommap(int fd)
 			{// auth ok
 				cd->sex = sex;
 
-				WFIFOHEAD(fd,20 + sizeof(struct mmo_charstatus));
+				WFIFOHEAD(fd,24 + sizeof(struct mmo_charstatus));
 				WFIFOW(fd,0) = 0x2afd;
-				WFIFOW(fd,2) = 20 + sizeof(struct mmo_charstatus);
+				WFIFOW(fd,2) = 24 + sizeof(struct mmo_charstatus);
 				WFIFOL(fd,4) = account_id;
-				WFIFOL(fd,8) = login_id1;
-				WFIFOL(fd,12) = (uint32)node->expiration_time; // FIXME: will wrap to negative after "19-Jan-2038, 03:14:07 AM GMT"
-				WFIFOL(fd,16) = node->login_id2;
-				memcpy(WFIFOP(fd,20), cd, sizeof(struct mmo_charstatus));
+				WFIFOL(fd,8) = node->login_id1;
+				WFIFOL(fd,12) = node->login_id2;
+				WFIFOL(fd,16) = (uint32)node->expiration_time; // FIXME: will wrap to negative after "19-Jan-2038, 03:14:07 AM GMT"
+				WFIFOL(fd,20) = node->gmlevel;
+				memcpy(WFIFOP(fd,24), cd, sizeof(struct mmo_charstatus));
 				WFIFOSET(fd, WFIFOW(fd,2));
 
 				// only use the auth once and mark user online
@@ -3309,7 +3246,6 @@ int parse_char(int fd)
 				return 0;
 		{
 			struct auth_node* node;
-			int GM_value;
 
 			int account_id = RFIFOL(fd,2);
 			uint32 login_id1 = RFIFOL(fd,6);
@@ -3325,16 +3261,9 @@ int parse_char(int fd)
 				//TODO: and perhaps send back a reply?
 				break;
 			}
-
-			if( (GM_value = isGM(account_id)) != 0 )
-				ShowInfo("Account Logged On; Account ID: %d (GM level %d).\n", account_id, GM_value);
-			else
-				ShowInfo("Account Logged On; Account ID: %d.\n", account_id);
 			
 			CREATE(session[fd]->session_data, struct char_session_data, 1);
 			sd = (struct char_session_data*)session[fd]->session_data;
-			strncpy(sd->email, "no mail", 40); // put here a mail without '@' to refuse deletion if we don't receive the e-mail
-			sd->expiration_time = 0; // unknown or unlimited (not displaying on map-server)
 			sd->account_id = account_id;
 			sd->login_id1 = login_id1;
 			sd->login_id2 = login_id2;
@@ -3454,7 +3383,6 @@ int parse_char(int fd)
 				cd->last_point.map = j;
 			}
 
-			//Send NEW auth packet [Kevin]
 			//FIXME: is this case even possible? [ultramage]
 			if ((map_fd = server[i].fd) < 1 || session[map_fd] == NULL)
 			{
@@ -3474,29 +3402,13 @@ int parse_char(int fd)
 			WFIFOW(fd,0) = 0x71;
 			WFIFOL(fd,2) = cd->char_id;
 			mapindex_getmapname_ext(mapindex_id2name(cd->last_point.map), (char*)WFIFOP(fd,6));
-
-			// Advanced subnet check [LuzZza]
-			subnet_map_ip = lan_subnetcheck(ipl);
+			subnet_map_ip = lan_subnetcheck(ipl); // Advanced subnet check [LuzZza]
 			WFIFOL(fd,22) = htonl((subnet_map_ip) ? subnet_map_ip : server[i].ip);
 			WFIFOW(fd,26) = ntows(htons(server[i].port)); // [!] LE byte order here [!]
 			WFIFOSET(fd,28);
 
 			ShowInfo("Character selection '%s' (account: %d, slot: %d).\n", cd->name, sd->account_id, ch);
 
-#if 0
-			// The server must request it [FlavioJS]
-			//Send auth ok to map server
-			WFIFOHEAD(map_fd,20 + sizeof(struct mmo_charstatus));
-			WFIFOW(map_fd,0) = 0x2afd;
-			WFIFOW(map_fd,2) = 20 + sizeof(struct mmo_charstatus);
-			WFIFOL(map_fd,4) = sd->account_id;
-			WFIFOL(map_fd,8) = sd->login_id1;
-			WFIFOL(map_fd,16) = sd->login_id2;
-			WFIFOL(map_fd,12) = (unsigned long)sd->expiration_time;
-			memcpy(WFIFOP(map_fd,20), cd, sizeof(struct mmo_charstatus));
-			WFIFOSET(map_fd, WFIFOW(map_fd,2));
-#endif
-
 			// create temporary auth entry
 			CREATE(node, struct auth_node, 1);
 			node->account_id = sd->account_id;
@@ -3505,6 +3417,7 @@ int parse_char(int fd)
 			node->login_id2 = sd->login_id2;
 			node->sex = sd->sex;
 			node->expiration_time = sd->expiration_time;
+			node->gmlevel = sd->gmlevel;
 			node->ip = ipl;
 			idb_put(auth_db, sd->account_id, node);
 		}
@@ -3706,15 +3619,6 @@ int parse_char(int fd)
 				session[fd]->flag.server = 1;
 				realloc_fifo(fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
 				char_mapif_init(fd);
-				// send gm acccounts level to map-servers
-				WFIFOHEAD(fd,4+5*GM_num);
-				WFIFOW(fd,0) = 0x2b15;
-				for(i = 0; i < GM_num; i++) {
-					WFIFOL(fd,4+5*i) = gm_account[i].account_id;
-					WFIFOB(fd,4+5*i+4) = (unsigned char)gm_account[i].level;
-				}
-				WFIFOW(fd,2) = 4+5*GM_num;
-				WFIFOSET(fd,WFIFOW(fd,2));
 			}
 
 			RFIFOSKIP(fd,60);
@@ -4245,7 +4149,6 @@ void do_final(void)
 	online_char_db->destroy(online_char_db, NULL); //dispose the db...
 	auth_db->destroy(auth_db, NULL);
 	
-	if(gm_account) aFree(gm_account);
 	if(char_dat) aFree(char_dat);
 
 	if (login_fd > 0)
diff --git a/src/char/char.h b/src/char/char.h
index 72077ac09..8c8d7c554 100644
--- a/src/char/char.h
+++ b/src/char/char.h
@@ -6,7 +6,6 @@
 
 #include "../common/mmo.h"
 
-#define START_CHAR_NUM 150000
 #define MAX_MAP_SERVERS 30
 
 #define DEFAULT_AUTOSAVE_INTERVAL 300*1000
diff --git a/src/char/inter.c b/src/char/inter.c
index 463d2dd4d..6f6f92bf0 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -650,6 +650,25 @@ int mapif_parse_NameChangeRequest(int fd)
 
 //--------------------------------------------------------
 
+/// Returns the length of the next complete packet to process,
+/// or 0 if no complete packet exists in the queue.
+///
+/// @param length The minimum allowed length, or -1 for dynamic lookup
+int inter_check_length(int fd, int length)
+{
+	if( length == -1 )
+	{// variable-length packet
+		if( RFIFOREST(fd) < 4 )
+			return 0;
+		length = RFIFOW(fd,2);
+	}
+
+	if( (int)RFIFOREST(fd) < length )
+		return 0;
+
+	return length;
+}
+
 // map server からの通信（１パケットのみ解析すること）
 // エラーなら0(false)、処理できたなら1、
 // パケット長が足りなければ2をかえさなければならない
@@ -695,19 +714,4 @@ int inter_parse_frommap(int fd) {
 	return 1;
 }
 
-// RFIFOのパケット長確認
-// 必要パケット長があればパケット長、まだ足りなければ0
-int inter_check_length(int fd, int length) {
-	if (length == -1) {	// 可変パケット長
-		RFIFOHEAD(fd);
-		if (RFIFOREST(fd) < 4)	// パケット長が未着
-			return 0;
-		length = RFIFOW(fd,2);
-	}
-
-	if ((int)RFIFOREST(fd) < length)	// パケットが未着
-		return 0;
-
-	return length;
-}
 #endif //TXT_SQL_CONVERT
diff --git a/src/char/inter.h b/src/char/inter.h
index 4752f600c..cf3eb4b2e 100644
--- a/src/char/inter.h
+++ b/src/char/inter.h
@@ -13,14 +13,11 @@ int inter_parse_frommap(int fd);
 int inter_mapif_init(int fd);
 int mapif_disconnectplayer(int fd, int account_id, int char_id, int reason);
 
-int inter_check_length(int fd,int length);
-
 int inter_log(char *fmt,...);
 
 #define inter_cfgName "conf/inter_athena.conf"
 
 extern unsigned int party_share_level;
-extern char inter_log_filename[1024];
 extern char main_chat_nick[16];
 
 //For TXT->SQL conversion
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 0ce2aecf6..f11fb7896 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -69,12 +69,6 @@ char db_path[1024] = "db";
 
 int db_use_sqldbs;
 
-char login_db[256] = "login";
-char login_db_account_id[32] = "account_id";
-char login_db_level[32] = "level";
-
-int lowest_gm_level = 1;
-
 struct mmo_map_server {
 	int fd;
 	uint32 ip;
@@ -135,6 +129,7 @@ struct char_session_data {
 	int found_char[MAX_CHARS]; // ids of chars on this account
 	char email[40]; // e-mail (default: a@a.com) by [Yor]
 	time_t expiration_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited)
+	int gmlevel;
 };
 
 int char_num, char_max;
@@ -164,10 +159,6 @@ unsigned int save_flag = 0;
 // Initial position (it's possible to set it in conf file)
 struct point start_point = { 0, 53, 111 };
 
-bool char_gm_read = false;
-struct gm_account *gm_account = NULL;
-int GM_num = 0;
-
 int console = 0;
 
 //-----------------------------------------------------
@@ -183,6 +174,7 @@ struct auth_node {
 	uint32 ip;
 	int sex;
 	time_t expiration_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited)
+	int gmlevel;
 };
 
 static DBMap* auth_db; // int account_id -> struct auth_node*
@@ -394,53 +386,6 @@ void set_all_offline_sql(void)
 		Sql_ShowDebug(sql_handle);
 }
 
-//----------------------------------------------------------------------
-// Determine if an account (id) is a GM account
-// and returns its level (or 0 if it isn't a GM account or if not found)
-//----------------------------------------------------------------------
-int isGM(int account_id)
-{
-	int i;
-
-	for(i = 0; i < GM_num; i++)
-		if (gm_account[i].account_id == account_id)
-			return gm_account[i].level;
-	return 0;
-}
-
-void read_gm_account(void)
-{
-	if(!char_gm_read)
-		return;
-	
-	if (gm_account != NULL)
-		aFree(gm_account);
-	GM_num = 0;
-
-	if( SQL_ERROR == Sql_Query(lsql_handle, "SELECT `%s`,`%s` FROM `%s` WHERE `%s`>='%d'", login_db_account_id, login_db_level, login_db, login_db_level, lowest_gm_level) )
-		Sql_ShowDebug(lsql_handle);
-
-	if( Sql_NumRows(lsql_handle) > 0 )
-	{
-		char* data;
-
-		CREATE(gm_account, struct gm_account, (size_t)Sql_NumRows(lsql_handle));
-		while( SQL_SUCCESS == Sql_NextRow(lsql_handle) )
-		{
-			// account_id
-			Sql_GetData(lsql_handle, 0, &data, NULL);
-			gm_account[GM_num].account_id = atoi(data);
-			// account_id
-			Sql_GetData(lsql_handle, 1, &data, NULL);
-			gm_account[GM_num].level = atoi(data);
-			++GM_num;
-		}
-	}
-	Sql_FreeResult(lsql_handle);
-
-	mapif_send_gmaccounts();
-}
-
 static void* create_charstatus(DBKey key, va_list args)
 {
 	struct mmo_charstatus *cp;
@@ -1636,7 +1581,7 @@ int char_family(int pl1, int pl2, int pl3)
 static void char_auth_ok(int fd, struct char_session_data *sd)
 {
 	struct online_char_data* character;
-	if (max_connect_user && count_users() >= max_connect_user && isGM(sd->account_id) < gm_allow_level)
+	if (max_connect_user && count_users() >= max_connect_user && sd->gmlevel < gm_allow_level)
 	{
 		// refuse connection (over populated)
 		WFIFOW(fd,0) = 0x6c;
@@ -1742,7 +1687,7 @@ int parse_fromlogin(int fd)
 
 		// acknowledgement of account authentication request
 		case 0x2713:
-			if (RFIFOREST(fd) < 59)
+			if (RFIFOREST(fd) < 60)
 				return 0;
 		{
 			int account_id = RFIFOL(fd,2);
@@ -1751,6 +1696,7 @@ int parse_fromlogin(int fd)
 			bool result = RFIFOB(fd,14);
 			const char* email = (const char*)RFIFOP(fd,15);
 			time_t expiration_time = (time_t)RFIFOL(fd,55);
+			int gmlevel = RFIFOB(fd,59);
 
 			// find the session with this account id
 			ARR_FIND( 0, fd_max, i, session[i] && (sd = (struct char_session_data*)session[i]->session_data) &&
@@ -1765,16 +1711,17 @@ int parse_fromlogin(int fd)
 				} else { // success
 					memcpy(sd->email, email, 40);
 					sd->expiration_time = expiration_time;
+					sd->gmlevel = gmlevel;
 					char_auth_ok(i, sd);
 				}
 			}
 		}
-			RFIFOSKIP(fd,59);
+			RFIFOSKIP(fd,60);
 		break;
 
 		// acknowledgement of e-mail/limited time request
 		case 0x2717:
-			if (RFIFOREST(fd) < 50)
+			if (RFIFOREST(fd) < 51)
 				return 0;
 
 			// find the session with this account id
@@ -1783,8 +1730,9 @@ int parse_fromlogin(int fd)
 			{
 				memcpy(sd->email, RFIFOP(fd,6), 40);
 				sd->expiration_time = (time_t)RFIFOL(fd,46);
+				sd->gmlevel = RFIFOB(fd,50);
 			}
-			RFIFOSKIP(fd,50);
+			RFIFOSKIP(fd,51);
 		break;
 
 		// login-server alive packet
@@ -1881,7 +1829,7 @@ int parse_fromlogin(int fd)
 				return 0;
 
 		{	//Receive account_reg2 registry, forward to map servers.
-			unsigned char buf[ACCOUNT_REG2_NUM*(256+32+2)+16];
+			unsigned char buf[13+ACCOUNT_REG2_NUM*sizeof(struct global_reg)];
 			memcpy(buf,RFIFOP(fd,0), RFIFOW(fd,2));
 			WBUFW(buf,0) = 0x3804; //Map server can now receive all kinds of reg values with the same packet. [Skotlex]
 			mapif_sendall(buf, WBUFW(buf,2));
@@ -1910,33 +1858,6 @@ int parse_fromlogin(int fd)
 			RFIFOSKIP(fd,11);
 		break;
 
-		// gm account information from login server
-		case 0x2732:
-			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
-				return 0;
-
-			if(!char_gm_read) {
-				unsigned char buf[32000]; //FIXME: this will crash
-				if (gm_account != NULL)
-					aFree(gm_account);
-				gm_account = (struct gm_account*)aCalloc(sizeof(struct gm_account) * ((RFIFOW(fd,2) - 4) / 5), 1);
-				GM_num = 0;
-				for (i = 4; i < RFIFOW(fd,2); i = i + 5) {
-					gm_account[GM_num].account_id = RFIFOL(fd,i);
-					gm_account[GM_num].level = (int)RFIFOB(fd,i+4);
-					//printf("GM account: %d -> level %d\n", gm_account[GM_num].account_id, gm_account[GM_num].level);
-					GM_num++;
-				}
-				ShowStatus("From login-server: receiving information of %d GM accounts.\n", GM_num);
-				// send new gm acccounts level to map-servers
-				memcpy(buf, RFIFOP(fd,0), RFIFOW(fd,2));
-				WBUFW(buf,0) = 0x2b15;
-				mapif_sendall(buf, RFIFOW(fd,2));
-			}
-
-			RFIFOSKIP(fd,RFIFOW(fd,2));
-		break;
-
 		// Login server request to kick a character out. [Skotlex]
 		case 0x2734:
 			if (RFIFOREST(fd) < 6)
@@ -2214,18 +2135,6 @@ int parse_frommap(int fd)
 		switch(RFIFOW(fd, 0))
 		{
 
-		case 0x2af7: // request from map-server to reload GM accounts. Transmission to login-server
-			if(char_gm_read) //Re-read gm accounts.
-				read_gm_account();
-			//Send to login request to reload gm accounts.
-			else if (login_fd > 0) { // don't send request if no login-server
-				WFIFOHEAD(login_fd,2);
-				WFIFOW(login_fd,0) = 0x2709;
-				WFIFOSET(login_fd,2);
-			}
-			RFIFOSKIP(fd,2);
-		break;
-
 		case 0x2afa: // Receiving map names list from the map-server
 			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
 				return 0;
@@ -2434,7 +2343,8 @@ int parse_frommap(int fd)
 			node->login_id2 = login_id2;
 			//node->sex = 0;
 			node->ip = ntohl(ip);
-			node->expiration_time = 0; // unlimited/unknown time by default (not display in map-server)
+			//node->expiration_time = 0; // unlimited/unknown time by default (not display in map-server)
+			//node->gmlevel = 0;
 			idb_put(auth_db, account_id, node);
 
 			//Set char to "@ char select" in online db [Kevin]
@@ -2467,7 +2377,7 @@ int parse_frommap(int fd)
 				mmo_char_fromsql(RFIFOL(fd,14), &char_dat, true);
 				char_data = (struct mmo_charstatus*)uidb_get(char_db_,RFIFOL(fd,14));
 			}
-			//Tell the new map server about this player using Kevin's new auth packet. [Skotlex]
+
 			if (map_fd >= 0 && session[map_fd] && char_data) 
 			{	//Send the map server the auth of this player.
 				struct auth_node* node;
@@ -2478,19 +2388,6 @@ int parse_frommap(int fd)
 				char_data->last_point.y = RFIFOW(fd,22);
 				char_data->sex = RFIFOB(fd,30);
 
-#if 0
-				// the map-server must request it [FlavioJS]
-				WFIFOHEAD(map_fd, 20 + sizeof(struct mmo_charstatus));
-				WFIFOW(map_fd,0) = 0x2afd;
-				WFIFOW(map_fd,2) = 20 + sizeof(struct mmo_charstatus);
-				WFIFOL(map_fd,4) = RFIFOL(fd,2); //Account ID
-				WFIFOL(map_fd,8) = RFIFOL(fd,6); //Login1
-				WFIFOL(map_fd,16) = RFIFOL(fd,10); //Login2
-				WFIFOL(map_fd,12) = (unsigned long)0; //TODO: expiration_time, how do I figure it out right now?
-				memcpy(WFIFOP(map_fd,20), char_data, sizeof(struct mmo_charstatus));
-				WFIFOSET(map_fd, WFIFOW(map_fd,2));
-#endif
-
 				// create temporary auth entry
 				CREATE(node, struct auth_node, 1);
 				node->account_id = RFIFOL(fd,2);
@@ -2588,9 +2485,10 @@ int parse_frommap(int fd)
 
 				if( login_fd <= 0 )
 					result = 3; // 3-login-server offline
-				else
-				if( acc != -1 && isGM(acc) < isGM(account_id) )
-					result = 2; // 2-gm level too low
+				//FIXME: need to move this check to login server [ultramage]
+//				else
+//				if( acc != -1 && isGM(acc) < isGM(account_id) )
+//					result = 2; // 2-gm level too low
 				else
 				switch( type ) {
 				case 1: // block
@@ -2838,14 +2736,15 @@ int parse_frommap(int fd)
 			{// auth ok
 				cd->sex = sex;
 
-				WFIFOHEAD(fd,20 + sizeof(struct mmo_charstatus));
+				WFIFOHEAD(fd,24 + sizeof(struct mmo_charstatus));
 				WFIFOW(fd,0) = 0x2afd;
-				WFIFOW(fd,2) = 20 + sizeof(struct mmo_charstatus);
+				WFIFOW(fd,2) = 24 + sizeof(struct mmo_charstatus);
 				WFIFOL(fd,4) = account_id;
-				WFIFOL(fd,8) = login_id1;
-				WFIFOL(fd,12) = (uint32)node->expiration_time; // FIXME: will wrap to negative after "19-Jan-2038, 03:14:07 AM GMT"
-				WFIFOL(fd,16) = node->login_id2;
-				memcpy(WFIFOP(fd,20), cd, sizeof(struct mmo_charstatus));
+				WFIFOL(fd,8) = node->login_id1;
+				WFIFOL(fd,12) = node->login_id2;
+				WFIFOL(fd,16) = (uint32)node->expiration_time; // FIXME: will wrap to negative after "19-Jan-2038, 03:14:07 AM GMT"
+				WFIFOL(fd,20) = node->gmlevel;
+				memcpy(WFIFOP(fd,24), cd, sizeof(struct mmo_charstatus));
 				WFIFOSET(fd, WFIFOW(fd,2));
 
 				// only use the auth once and mark user online
@@ -2996,7 +2895,6 @@ int parse_char(int fd)
 			
 			CREATE(session[fd]->session_data, struct char_session_data, 1);
 			sd = (struct char_session_data*)session[fd]->session_data;
-			sd->expiration_time = 0; // unknown or unlimited (not displaying on map-server)
 			sd->account_id = account_id;
 			sd->login_id1 = login_id1;
 			sd->login_id2 = login_id2;
@@ -3149,8 +3047,6 @@ int parse_char(int fd)
 			WFIFOW(fd,0) = 0x71;
 			WFIFOL(fd,2) = cp->char_id;
 			mapindex_getmapname_ext(mapindex_id2name(cp->last_point.map), (char*)WFIFOP(fd,6));
-
-			// Advanced subnet check [LuzZza]
 			subnet_map_ip = lan_subnetcheck(ipl);
 			WFIFOL(fd,22) = htonl((subnet_map_ip) ? subnet_map_ip : server[i].ip);
 			WFIFOW(fd,26) = ntows(htons(server[i].port)); // [!] LE byte order here [!]
@@ -3164,6 +3060,7 @@ int parse_char(int fd)
 			node->login_id2 = sd->login_id2;
 			node->sex = sd->sex;
 			node->expiration_time = sd->expiration_time;
+			node->gmlevel = sd->gmlevel;
 			node->ip = ipl;
 			idb_put(auth_db, sd->account_id, node);
 
@@ -3324,15 +3221,6 @@ int parse_char(int fd)
 				session[fd]->flag.server = 1;
 				realloc_fifo(fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
 				char_mapif_init(fd);
-				// send gm acccounts level to map-servers
-				WFIFOHEAD(fd,4+5*GM_num); 
-				WFIFOW(fd,0) = 0x2b15;
-				for(i = 0; i < GM_num; i++) {
-					WFIFOL(fd,4+5*i) = gm_account[i].account_id;
-					WFIFOB(fd,4+5*i+4) = (unsigned char)gm_account[i].level;
-				}
-				WFIFOW(fd,2) = 4+5*GM_num;
-				WFIFOSET(fd,WFIFOW(fd,2));
 			}
 			
 			RFIFOSKIP(fd,60);
@@ -3669,21 +3557,6 @@ void sql_config_read(const char* cfgName)
 
 		if(!strcmpi(w1,"char_db"))
 			strcpy(char_db,w2);
-#ifndef TXT_SQL_CONVERT
-		else if(!strcmpi(w1,"gm_read_method"))
-			char_gm_read = config_switch(w2);
-		//custom columns for login database
-		else if(!strcmpi(w1,"login_db"))
-			strcpy(login_db,w2);
-		else if(!strcmpi(w1,"login_db_level"))
-			strcpy(login_db_level,w2);
-		else if(!strcmpi(w1,"login_db_account_id"))
-			strcpy(login_db_account_id,w2);
-		else if(!strcmpi(w1,"lowest_gm_level")) {
-			lowest_gm_level = atoi(w2);
-			ShowStatus("set lowest_gm_level : %s\n", w2);
-		}
-#endif
 		else if(!strcmpi(w1,"scdata_db"))
 			strcpy(scdata_db,w2);
 		else if(!strcmpi(w1,"cart_db"))
@@ -3920,11 +3793,6 @@ void do_final(void)
 	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `ragsrvinfo") )
 		Sql_ShowDebug(sql_handle);
 
-	if(gm_account)  {
-		aFree(gm_account);
-		gm_account = 0;
-	}
-
 	if (login_fd > 0)
 		do_close(login_fd);
 	if (char_fd > 0)
@@ -3934,8 +3802,6 @@ void do_final(void)
 	auth_db->destroy(auth_db, NULL);
 
 	Sql_Free(sql_handle);
-	if( lsql_handle )
-		Sql_Free(lsql_handle);
 
 	ShowInfo("ok! all done...\n");
 }
@@ -3986,8 +3852,6 @@ int do_init(int argc, char **argv)
 	online_char_db = idb_alloc(DB_OPT_RELEASE_DATA);
 	mmo_char_sql_init();
 	char_read_fame_list(); //Read fame lists.
-	if(char_gm_read)
-		read_gm_account();
 	ShowInfo("char server initialized.\n");
 
 	set_defaultparse(parse_char);
diff --git a/src/char_sql/char.h b/src/char_sql/char.h
index 19c6fcba5..33c4544b2 100644
--- a/src/char_sql/char.h
+++ b/src/char_sql/char.h
@@ -6,7 +6,6 @@
 
 struct mmo_charstatus;
 
-#define START_CHAR_NUM 150000
 #define MAX_MAP_SERVERS 30
 
 #define DEFAULT_AUTOSAVE_INTERVAL 300*1000
@@ -64,13 +63,6 @@ extern char quest_obj_db[256];
 
 extern int db_use_sqldbs; // added for sql item_db read for char server [Valaris]
 
-extern char login_db_level[32];
-extern char login_db_account_id[32];
-
-extern int lowest_gm_level;
-extern int GM_num;
-extern struct gm_account *gm_account;
-
 extern int guild_exp_rate;
 extern int log_inter;
 
diff --git a/src/char_sql/inter.c b/src/char_sql/inter.c
index 261ed9b0d..58215d5da 100644
--- a/src/char_sql/inter.c
+++ b/src/char_sql/inter.c
@@ -28,7 +28,6 @@
 
 
 Sql* sql_handle = NULL;
-Sql* lsql_handle = NULL;
 
 int char_server_port = 3306;
 char char_server_ip[32] = "127.0.0.1";
@@ -37,12 +36,6 @@ char char_server_pw[32] = "ragnarok";
 char char_server_db[32] = "ragnarok";
 char default_codepage[32] = ""; //Feature by irmin.
 
-int login_server_port = 3306;
-char login_server_ip[32] = "127.0.0.1";
-char login_server_id[32] = "ragnarok";
-char login_server_pw[32] = "ragnarok";
-char login_server_db[32] = "ragnarok";
-
 #ifndef TXT_SQL_CONVERT
 
 static struct accreg *accreg_pt;
@@ -71,8 +64,6 @@ struct WisData {
 static DBMap* wis_db = NULL; // int wis_id -> struct WisData*
 static int wis_dellist[WISDELLIST_MAX], wis_delnum;
 
-int inter_sql_test (void);
-
 #endif //TXT_SQL_CONVERT
 //--------------------------------------------------------
 // Save registry to sql
@@ -237,29 +228,6 @@ static int inter_config_read(const char* cfgName)
 			strcpy(default_codepage,w2);
 			ShowStatus ("set default_codepage : %s\n", w2);
 		}
-		//Logins information to be read from the inter_athena.conf
-		//for character deletion (checks email in the loginDB)
-		else
-		if(!strcmpi(w1,"login_server_ip")) {
-			strcpy(login_server_ip, w2);
-			ShowStatus ("set login_server_ip : %s\n", w2);
-		} else
-		if(!strcmpi(w1,"login_server_port")) {
-			login_server_port = atoi(w2);
-			ShowStatus ("set login_server_port : %s\n", w2);
-		} else
-		if(!strcmpi(w1,"login_server_id")) {
-			strcpy(login_server_id, w2);
-			ShowStatus ("set login_server_id : %s\n", w2);
-		} else
-		if(!strcmpi(w1,"login_server_pw")) {
-			strcpy(login_server_pw, w2);
-			ShowStatus ("set login_server_pw : %s\n", w2);
-		} else
-		if(!strcmpi(w1,"login_server_db")) {
-			strcpy(login_server_db, w2);
-			ShowStatus ("set login_server_db : %s\n", w2);
-		}
 #ifndef TXT_SQL_CONVERT
 		else if(!strcmpi(w1,"party_share_level"))
 			party_share_level = atoi(w2);
@@ -297,38 +265,6 @@ int inter_log(char* fmt, ...)
 	return 0;
 }
 
-/*=============================================
- * Does a mysql_ping to all connection handles
- *---------------------------------------------*/
-int inter_sql_ping(int tid, unsigned int tick, int id, intptr data) 
-{
-	ShowInfo("Pinging SQL server to keep connection alive...\n");
-	Sql_Ping(sql_handle);
-	if( char_gm_read )
-		Sql_Ping(lsql_handle);
-	return 0;
-}
-
-
-int sql_ping_init(void)
-{
-	uint32 connection_timeout, connection_ping_interval;
-
-	// set a default value first
-	connection_timeout = 28800; // 8 hours
-
-	// ask the mysql server for the timeout value
-	if( SQL_SUCCESS == Sql_GetTimeout(sql_handle, &connection_timeout) && connection_timeout < 60 )
-		connection_timeout = 60;
-
-	// establish keepalive
-	connection_ping_interval = connection_timeout - 30; // 30-second reserve
-	add_timer_func_list(inter_sql_ping, "inter_sql_ping");
-	add_timer_interval(gettick() + connection_ping_interval*1000, inter_sql_ping, 0, 0, connection_ping_interval*1000);
-
-	return 0;
-}
-
 #endif //TXT_SQL_CONVERT
 
 // initialize
@@ -348,34 +284,10 @@ int inter_init_sql(const char *file)
 		Sql_Free(sql_handle);
 		exit(EXIT_FAILURE);
 	}
-#ifndef TXT_SQL_CONVERT
-	else if (inter_sql_test()) {
-		ShowStatus("Connect Success! (Character Server)\n");
-	}
 
-	if(char_gm_read) {
-		lsql_handle = Sql_Malloc();
-		ShowInfo("Connect Character DB server.... (login server)\n");
-		if( SQL_ERROR == Sql_Connect(lsql_handle, login_server_id, login_server_pw, login_server_ip, (uint16)login_server_port, login_server_db) )
-		{
-			Sql_ShowDebug(lsql_handle);
-			Sql_Free(lsql_handle);
-			Sql_Free(sql_handle);
-			exit(EXIT_FAILURE);
-		}
-		else
-		{
-			ShowStatus ("Connect Success! (Login Server)\n");
-		}
-	}
-#endif //TXT_SQL_CONVERT
 	if( *default_codepage ) {
 		if( SQL_ERROR == Sql_SetEncoding(sql_handle, default_codepage) )
 			Sql_ShowDebug(sql_handle);
-#ifndef TXT_SQL_CONVERT
-		if( char_gm_read && SQL_ERROR == Sql_SetEncoding(lsql_handle, default_codepage) )
-			Sql_ShowDebug(lsql_handle);
-#endif //TXT_SQL_CONVERT
 	}
 
 #ifndef TXT_SQL_CONVERT
@@ -389,46 +301,11 @@ int inter_init_sql(const char *file)
 	inter_mail_sql_init();
 	inter_auction_sql_init();
 
-	sql_ping_init();
 #endif //TXT_SQL_CONVERT
 	return 0;
 }
 #ifndef TXT_SQL_CONVERT
 
-int inter_sql_test (void)
-{
-	const char fields[][24] = {
-		"father",	// version 1363
-		"fame",		// version 1491
-	};	
-	char buf[1024] = "";
-	char* p;
-	size_t len;
-	int i;
-
-	if( SQL_ERROR == Sql_GetColumnNames(sql_handle, char_db, buf, sizeof(buf), '\n') )
-		Sql_ShowDebug(sql_handle);
-
-	// check DB strings
-	for( i = 0; i < ARRAYLENGTH(fields); ++i )
-	{
-		len = strlen(fields[i]);
-		p = strstr(buf, fields[i]);
-		while( p != NULL && p[len] != '\n' )
-			p = strstr(p, fields[i]);
-		if( p == NULL )
-		{
-			ShowSQL ("Field `%s` not be found in `%s`. Consider updating your database!\n", fields[i], char_db);
-			if( lsql_handle )
-				Sql_Free(lsql_handle);
-			Sql_Free(sql_handle);
-			exit(EXIT_FAILURE);
-		}
-	}
-
-	return 1;
-}
-
 // finalize
 void inter_final(void)
 {
@@ -533,26 +410,6 @@ int mapif_account_reg_reply(int fd,int account_id,int char_id, int type)
 	return 0;
 }
 
-int mapif_send_gmaccounts()
-{
-	int i, len = 4;
-	unsigned char buf[32000];
-
-	// forward the gm accounts to the map server
-	len = 4;
-	WBUFW(buf,0) = 0x2b15;
-				
-	for(i = 0; i < GM_num; i++) {
-		WBUFL(buf,len) = gm_account[i].account_id;
-		WBUFB(buf,len+4) = (uint8)gm_account[i].level;
-		len += 5;
-	}
-	WBUFW(buf,2) = len;
-	mapif_sendall(buf, len);
-
-	return 0;
-}
-
 //Request to kick char from a certain map server. [Skotlex]
 int mapif_disconnectplayer(int fd, int account_id, int char_id, int reason)
 {
@@ -815,6 +672,26 @@ int mapif_parse_NameChangeRequest(int fd)
 }
 
 //--------------------------------------------------------
+
+/// Returns the length of the next complete packet to process,
+/// or 0 if no complete packet exists in the queue.
+///
+/// @param length The minimum allowed length, or -1 for dynamic lookup
+int inter_check_length(int fd, int length)
+{
+	if( length == -1 )
+	{// variable-length packet
+		if( RFIFOREST(fd) < 4 )
+			return 0;
+		length = RFIFOW(fd,2);
+	}
+
+	if( (int)RFIFOREST(fd) < length )
+		return 0;
+
+	return length;
+}
+
 int inter_parse_frommap(int fd)
 {
 	int cmd;
@@ -855,18 +732,4 @@ int inter_parse_frommap(int fd)
 	return 1;
 }
 
-// RFIFO check
-int inter_check_length(int fd, int length)
-{
-	if(length == -1) {	// v-len packet
-		if(RFIFOREST(fd) < 4)	// packet not yet
-			return 0;
-		length = RFIFOW(fd, 2);
-	}
-
-	if((int)RFIFOREST(fd) < length)	// packet not yet
-		return 0;
-
-	return length;
-}
 #endif //TXT_SQL_CONVERT
diff --git a/src/char_sql/inter.h b/src/char_sql/inter.h
index a44ce77e1..ac2e1785f 100644
--- a/src/char_sql/inter.h
+++ b/src/char_sql/inter.h
@@ -14,30 +14,15 @@ int inter_mapif_init(int fd);
 int mapif_send_gmaccounts(void);
 int mapif_disconnectplayer(int fd, int account_id, int char_id, int reason);
 
-int inter_check_length(int fd,int length);
-
 int inter_log(char *fmt,...);
 
 #define inter_cfgName "conf/inter_athena.conf"
 
 extern unsigned int party_share_level;
-extern char inter_log_filename[1024];
 
 extern Sql* sql_handle;
 extern Sql* lsql_handle;
 
-extern int char_server_port;
-extern char char_server_ip[32];
-extern char char_server_id[32];
-extern char char_server_pw[32];
-extern char char_server_db[32];
-
-extern int login_db_server_port;
-extern char login_db_server_ip[32];
-extern char login_db_server_id[32];
-extern char login_db_server_pw[32];
-extern char login_db_server_db[32];
-
 extern char main_chat_nick[16];
 
 int inter_accreg_tosql(int account_id, int char_id, struct accreg *reg, int type);
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 2e96e8910..9e419c65b 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -90,6 +90,7 @@
 //Limits to avoid ID collision with other game objects
 #define START_ACCOUNT_NUM 2000000
 #define END_ACCOUNT_NUM 100000000
+#define START_CHAR_NUM 150000
 
 //Base Homun skill.
 #define HM_SKILLBASE 8001
@@ -344,11 +345,6 @@ struct registry {
 	struct global_reg account2[ACCOUNT_REG2_NUM];
 };
 
-struct gm_account {
-	int account_id;
-	int level;
-};
-
 struct party_member {
 	int account_id;
 	int char_id;
diff --git a/src/common/plugins.c b/src/common/plugins.c
index 01a6194cd..c6c362de5 100644
--- a/src/common/plugins.c
+++ b/src/common/plugins.c
@@ -287,7 +287,7 @@ char *DLL_ERROR(void)
 {
 	static char dllbuf[80];
 	DWORD dw = GetLastError();
-	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, dw, 0, dllbuf, 80, NULL);
+	FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, dw, 0, dllbuf, 80, NULL);
 	return dllbuf;
 }
 #endif
diff --git a/src/common/plugins.h b/src/common/plugins.h
index 9d93bcaa6..e71a4e8c5 100644
--- a/src/common/plugins.h
+++ b/src/common/plugins.h
@@ -16,7 +16,7 @@
 
 	#define WIN32_LEAN_AND_MEAN
 	#include <windows.h>
-	#define DLL_OPEN(x)		LoadLibrary(x)
+	#define DLL_OPEN(x)		LoadLibraryA(x)
 	#define DLL_SYM(x,y)	GetProcAddress(x,y)
 	#define DLL_CLOSE(x)	FreeLibrary(x)
 	char *DLL_ERROR(void);
diff --git a/src/common/sql.c b/src/common/sql.c
index 567fbb703..47ff320ea 100644
--- a/src/common/sql.c
+++ b/src/common/sql.c
@@ -5,6 +5,7 @@
 #include "../common/malloc.h"
 #include "../common/showmsg.h"
 #include "../common/strlib.h"
+#include "../common/timer.h"
 #include "sql.h"
 
 #ifdef WIN32
@@ -24,6 +25,7 @@ struct Sql
 	MYSQL_RES* result;
 	MYSQL_ROW row;
 	unsigned long* lengths;
+	int keepalive;
 };
 
 
@@ -73,6 +75,8 @@ Sql* Sql_Malloc(void)
 
 
 
+static int Sql_P_Keepalive(Sql* self);
+
 /// Establishes a connection.
 int Sql_Connect(Sql* self, const char* user, const char* passwd, const char* host, uint16 port, const char* db)
 {
@@ -85,6 +89,14 @@ int Sql_Connect(Sql* self, const char* user, const char* passwd, const char* hos
 		ShowSQL("%s\n", mysql_error(&self->handle));
 		return SQL_ERROR;
 	}
+
+	self->keepalive = Sql_P_Keepalive(self);
+	if( self->keepalive == INVALID_TIMER )
+	{
+		ShowSQL("Failed to establish keepalive for DB connection!\n");
+		return SQL_ERROR;
+	}
+
 	return SQL_SUCCESS;
 }
 
@@ -162,6 +174,44 @@ int Sql_Ping(Sql* self)
 
 
 
+/// Wrapper function for Sql_Ping.
+///
+/// @private
+static int Sql_P_KeepaliveTimer(int tid, unsigned int tick, int id, intptr data)
+{
+	Sql* self = (Sql*)data;
+	ShowInfo("Pinging SQL server to keep connection alive...\n");
+	Sql_Ping(self);
+	return 0;
+}
+
+
+
+/// Establishes keepalive (periodic ping) on the connection.
+///
+/// @return the keepalive timer id, or INVALID_TIMER
+/// @private
+static int Sql_P_Keepalive(Sql* self)
+{
+	uint32 timeout, ping_interval;
+
+	// set a default value first
+	timeout = 28800; // 8 hours
+
+	// request the timeout value from the mysql server
+	Sql_GetTimeout(self, &timeout);
+
+	if( timeout < 60 )
+		timeout = 60;
+
+	// establish keepalive
+	ping_interval = timeout - 30; // 30-second reserve
+	//add_timer_func_list(Sql_P_KeepaliveTimer, "Sql_P_KeepaliveTimer");
+	return add_timer_interval(gettick() + ping_interval*1000, Sql_P_KeepaliveTimer, 0, (int)self, ping_interval*1000);
+}
+
+
+
 /// Escapes a string.
 size_t Sql_EscapeString(Sql* self, char *out_to, const char *from)
 {
@@ -356,6 +406,7 @@ void Sql_Free(Sql* self)
 	{
 		Sql_FreeResult(self);
 		StringBuf_Destroy(&self->buf);
+		delete_timer(self->keepalive, Sql_P_KeepaliveTimer);
 		aFree(self);
 	}
 }
diff --git a/src/common/utils.c b/src/common/utils.c
index ce9ea56f2..c1128edb4 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -77,7 +77,7 @@ static char* checkpath(char *path, const char *srcpath)
 
 void findfile(const char *p, const char *pat, void (func)(const char*))
 {	
-	WIN32_FIND_DATA FindFileData;
+	WIN32_FIND_DATAA FindFileData;
 	HANDLE hFind;
 	char tmppath[MAX_PATH+1];
 	
@@ -90,7 +90,7 @@ void findfile(const char *p, const char *pat, void (func)(const char*))
 	else
 		strcat(tmppath, "*");
 	
-	hFind = FindFirstFile(tmppath, &FindFileData);
+	hFind = FindFirstFileA(tmppath, &FindFileData);
 	if (hFind != INVALID_HANDLE_VALUE)
 	{
 		do
@@ -111,7 +111,7 @@ void findfile(const char *p, const char *pat, void (func)(const char*))
 			{
 				findfile(tmppath, pat, func);
 			}
-		}while (FindNextFile(hFind, &FindFileData) != 0);
+		}while (FindNextFileA(hFind, &FindFileData) != 0);
 		FindClose(hFind);
 	}
 	return;
diff --git a/src/ladmin/ladmin.c b/src/ladmin/ladmin.c
index b798ef385..56e08bde5 100644
--- a/src/ladmin/ladmin.c
+++ b/src/ladmin/ladmin.c
@@ -3,8 +3,6 @@
 
 ///////////////////////////////////////////////////////////////////////////
 // EAthena login-server remote administration tool
-// Ladamin in C by [Yor]
-// if you modify this software, modify ladmin in tool too.
 ///////////////////////////////////////////////////////////////////////////
 
 #include "../common/cbasetypes.h"
@@ -20,27 +18,6 @@
 
 #include <sys/types.h>
 #include <time.h>
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <winsock2.h>
-void Gettimeofday(struct timeval *timenow)
-{
-	time_t t;
-	t = clock();
-	timenow->tv_usec = t;
-	timenow->tv_sec = t / CLK_TCK;
-	return;
-}
-#define gettimeofday(timenow, dummy) Gettimeofday(timenow)
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <sys/time.h> // gettimeofday
-#include <sys/ioctl.h>
-#include <unistd.h> // close
-#include <arpa/inet.h> // inet_addr
-#include <netdb.h> // gethostbyname
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
@@ -54,7 +31,6 @@ void Gettimeofday(struct timeval *timenow)
 //   IP of the login server.
 //   Port where the login-server listens incoming packets.
 //   Password of administration (same of config_athena.conf).
-//   Displayed language of the sofware (if not correct, english is used).
 // IMPORTANT:
 //   Be sure that you authorize remote administration in login-server
 //   (see login_athena.conf, 'admin_state' parameter)
@@ -63,10 +39,9 @@ char loginserverip[16] = "127.0.0.1";        // IP of login-server
 int loginserverport = 6900;                  // Port of login-server
 char loginserveradminpassword[24] = "admin"; // Administration password
 int passenc = 0;                             // Encoding type of the password
-char defaultlanguage = 'E';                  // Default language (F: Fran軋is/E: English)
-                                             // (if it's not 'F', default is English)
 char ladmin_log_filename[1024] = "log/ladmin.log";
 char date_format[32] = "%Y-%m-%d %H:%M:%S";
+
 //-------------------------------------------------------------------------
 //  LIST of COMMANDs that you can type at the prompt:
 //    To use these commands you can only type only the first letters.
@@ -154,9 +129,6 @@ char date_format[32] = "%Y-%m-%d %H:%M:%S";
 //  kamib <message>
 //    Sends a broadcast message on all map-server (in blue).
 //
-//  language <language>
-//    Change the language of displaying.
-//
 //  list/ls [start_id [end_id]]
 //    Display a list of accounts.
 //    'start_id', 'end_id': indicate end and start identifiers.
@@ -250,6 +222,7 @@ char date_format[32] = "%Y-%m-%d %H:%M:%S";
 //    Displays complete information of an account.
 //
 //-------------------------------------------------------------------------
+
 int login_fd;
 int login_ip;
 int bytes_to_read = 0; // flag to know if we waiting bytes from login-server
@@ -265,7 +238,7 @@ int ladmin_log(char *fmt, ...)
 {
 	FILE *logfp;
 	va_list ap;
-	struct timeval tv;
+	time_t t;
 	char tmpstr[2048];
 
 	va_start(ap, fmt);
@@ -275,9 +248,9 @@ int ladmin_log(char *fmt, ...)
 		if (fmt[0] == '\0') // jump a line if no message
 			fprintf(logfp, "\n");
 		else {
-			gettimeofday(&tv, NULL);
-			strftime(tmpstr, 24, date_format, localtime((const time_t*)&(tv.tv_sec)));
-			sprintf(tmpstr + strlen(tmpstr), ".%03d: %s", (int)tv.tv_usec / 1000, fmt);
+			t = time(NULL);
+			strftime(tmpstr, 24, date_format, localtime(&t));
+			sprintf(tmpstr + strlen(tmpstr), ": %s", fmt);
 			vfprintf(logfp, tmpstr, ap);
 		}
 		fclose(logfp);
@@ -292,24 +265,15 @@ int ladmin_log(char *fmt, ...)
 //---------------------------------------------
 char* makeordinal(int number)
 {
-	if (defaultlanguage == 'F') {
-		if (number == 0)
-			return "";
-		else if (number == 1)
-			return "er";
+	if ((number % 10) < 4 && (number % 10) != 0 && (number < 10 || number > 20)) {
+		if ((number % 10) == 1)
+			return "st";
+		else if ((number % 10) == 2)
+			return "nd";
 		else
-			return "鑪e";
+			return "rd";
 	} else {
-		if ((number % 10) < 4 && (number % 10) != 0 && (number < 10 || number > 20)) {
-			if ((number % 10) == 1)
-				return "st";
-			else if ((number % 10) == 2)
-				return "nd";
-			else
-				return "rd";
-		} else {
-			return "th";
-		}
+		return "th";
 	}
 	return "";
 }
@@ -323,36 +287,21 @@ int verify_accountname(char* account_name)
 
 	for(i = 0; account_name[i]; i++) {
 		if (account_name[i] < 32) {
-			if (defaultlanguage == 'F') {
-				ShowMessage("Caract鑽e interdit trouv� dans le nom du compte (%d%s caract鑽e).\n", i+1, makeordinal(i+1));
-				ladmin_log("Caract鑽e interdit trouv� dans le nom du compte (%d%s caract鑽e).\n", i+1, makeordinal(i+1));
-			} else {
-				ShowMessage("Illegal character found in the account name (%d%s character).\n", i+1, makeordinal(i+1));
-				ladmin_log("Illegal character found in the account name (%d%s character).\n", i+1, makeordinal(i+1));
-			}
+			ShowMessage("Illegal character found in the account name (%d%s character).\n", i+1, makeordinal(i+1));
+			ladmin_log("Illegal character found in the account name (%d%s character).\n", i+1, makeordinal(i+1));
 			return 0;
 		}
 	}
 
 	if (strlen(account_name) < 4) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Nom du compte trop court. Entrez un nom de compte de 4-23 caract鑽es.\n");
-			ladmin_log("Nom du compte trop court. Entrez un nom de compte de 4-23 caract鑽es.\n");
-		} else {
-			ShowMessage("Account name is too short. Please input an account name of 4-23 bytes.\n");
-			ladmin_log("Account name is too short. Please input an account name of 4-23 bytes.\n");
-		}
+		ShowMessage("Account name is too short. Please input an account name of 4-23 bytes.\n");
+		ladmin_log("Account name is too short. Please input an account name of 4-23 bytes.\n");
 		return 0;
 	}
 
 	if (strlen(account_name) > 23) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Nom du compte trop long. Entrez un nom de compte de 4-23 caract鑽es.\n");
-			ladmin_log("Nom du compte trop long. Entrez un nom de compte de 4-23 caract鑽es.\n");
-		} else {
-			ShowMessage("Account name is too long. Please input an account name of 4-23 bytes.\n");
-			ladmin_log("Account name is too long. Please input an account name of 4-23 bytes.\n");
-		}
+		ShowMessage("Account name is too long. Please input an account name of 4-23 bytes.\n");
+		ladmin_log("Account name is too long. Please input an account name of 4-23 bytes.\n");
 		return 0;
 	}
 
@@ -368,50 +317,34 @@ int typepasswd(char * password)
 	int letter;
 	int i;
 
-	if (defaultlanguage == 'F') {
-		ladmin_log("Aucun mot de passe n'a 騁� donn�. Demande d'un mot de passe.\n");
-	} else {
-		ladmin_log("No password was given. Request to obtain a password.\n");
-	}
+	ladmin_log("No password was given. Request to obtain a password.\n");
 
 	memset(password1, '\0', sizeof(password1));
 	memset(password2, '\0', sizeof(password2));
-	if (defaultlanguage == 'F')
-		ShowMessage("\033[1;36m Entrez le mot de passe > \033[0;32;42m");
-	else
-		ShowMessage("\033[1;36m Type the password > \033[0;32;42m");
-		i = 0;
-		while ((letter = getchar()) != '\n')
-			password1[i++] = letter;
-	if (defaultlanguage == 'F')
-		ShowMessage("\033[0m\033[1;36m R�-entrez le mot de passe > \033[0;32;42m");
-	else
-		ShowMessage("\033[0m\033[1;36m Verify the password > \033[0;32;42m");
-		i = 0;
-		while ((letter = getchar()) != '\n')
-			password2[i++] = letter;
+
+	ShowMessage("\033[1;36m Type the password > \033[0;32;42m");
+
+	i = 0;
+	while ((letter = getchar()) != '\n')
+		password1[i++] = letter;
+
+	ShowMessage("\033[0m\033[1;36m Verify the password > \033[0;32;42m");
+
+	i = 0;
+	while ((letter = getchar()) != '\n')
+		password2[i++] = letter;
 
 	ShowMessage("\033[0m");
 	fflush(stdout);
 	fflush(stdin);
 
 	if (strcmp(password1, password2) != 0) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Erreur de v駻ification du mot de passe: Saisissez le m麥e mot de passe svp.\n");
-			ladmin_log("Erreur de v駻ification du mot de passe: Saisissez le m麥e mot de passe svp.\n");
-			ladmin_log("  Premier mot de passe: %s, second mot de passe: %s.\n", password1, password2);
-		} else {
-			ShowMessage("Password verification failed. Please input same password.\n");
-			ladmin_log("Password verification failed. Please input same password.\n");
-			ladmin_log("  First password: %s, second password: %s.\n", password1, password2);
-		}
+		ShowMessage("Password verification failed. Please input same password.\n");
+		ladmin_log("Password verification failed. Please input same password.\n");
+		ladmin_log("  First password: %s, second password: %s.\n", password1, password2);
 		return 0;
 	}
-	if (defaultlanguage == 'F') {
-		ladmin_log("Mot de passe saisi: %s.\n", password1);
-	} else {
-		ladmin_log("Typed password: %s.\n", password1);
-	}
+	ladmin_log("Typed password: %s.\n", password1);
 	strcpy(password, password1);
 	return 1;
 }
@@ -425,36 +358,21 @@ int verify_password(char * password)
 
 	for(i = 0; password[i]; i++) {
 		if (password[i] < 32) {
-			if (defaultlanguage == 'F') {
-				ShowMessage("Caract鑽e interdit trouv� dans le mot de passe (%d%s caract鑽e).\n", i+1, makeordinal(i+1));
-				ladmin_log("Caract鑽e interdit trouv� dans le nom du compte (%d%s caract鑽e).\n", i+1, makeordinal(i+1));
-			} else {
-				ShowMessage("Illegal character found in the password (%d%s character).\n", i+1, makeordinal(i+1));
-				ladmin_log("Illegal character found in the password (%d%s character).\n", i+1, makeordinal(i+1));
-			}
+			ShowMessage("Illegal character found in the password (%d%s character).\n", i+1, makeordinal(i+1));
+			ladmin_log("Illegal character found in the password (%d%s character).\n", i+1, makeordinal(i+1));
 			return 0;
 		}
 	}
 
 	if (strlen(password) < 4) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Nom du compte trop court. Entrez un nom de compte de 4-23 caract鑽es.\n");
-			ladmin_log("Nom du compte trop court. Entrez un nom de compte de 4-23 caract鑽es.\n");
-		} else {
-			ShowMessage("Account name is too short. Please input an account name of 4-23 bytes.\n");
-			ladmin_log("Account name is too short. Please input an account name of 4-23 bytes.\n");
-		}
+		ShowMessage("Account name is too short. Please input an account name of 4-23 bytes.\n");
+		ladmin_log("Account name is too short. Please input an account name of 4-23 bytes.\n");
 		return 0;
 	}
 
 	if (strlen(password) > 23) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Mot de passe trop long. Entrez un mot de passe de 4-23 caract鑽es.\n");
-			ladmin_log("Mot de passe trop long. Entrez un mot de passe de 4-23 caract鑽es.\n");
-		} else {
-			ShowMessage("Password is too long. Please input a password of 4-23 bytes.\n");
-			ladmin_log("Password is too long. Please input a password of 4-23 bytes.\n");
-		}
+		ShowMessage("Password is too long. Please input a password of 4-23 bytes.\n");
+		ladmin_log("Password is too long. Please input a password of 4-23 bytes.\n");
 		return 0;
 	}
 
@@ -467,9 +385,7 @@ int verify_password(char * password)
 int check_command(char * command)
 {
 // help
-	if (strncmp(command, "aide", 2) == 0 && strncmp(command, "aide", strlen(command)) == 0) // not 1 letter command: 'aide' or 'add'?
-		strcpy(command, "aide");
-	else if (strncmp(command, "help", 1) == 0 && strncmp(command, "help", strlen(command)) == 0)
+	if (strncmp(command, "help", 1) == 0 && strncmp(command, "help", strlen(command)) == 0)
 		strcpy(command, "help");
 // general commands
 	else if (strncmp(command, "add", 2) == 0 && strncmp(command, "add", strlen(command)) == 0) // not 1 letter command: 'aide' or 'add'?
@@ -506,9 +422,7 @@ int check_command(char * command)
 //		strcpy(command, "kami");
 //	else if (strncmp(command, "kamib", 5) == 0 && strncmp(command, "kamib", strlen(command)) == 0) // only all letters command: 'kami' or 'kamib'?
 //		strcpy(command, "kamib");
-	else if ((strncmp(command, "language", 2) == 0 && strncmp(command, "language", strlen(command)) == 0)) // not 1 letter command: 'language' or 'list'?
-		strcpy(command, "language");
-	else if ((strncmp(command, "list", 2) == 0 && strncmp(command, "list", strlen(command)) == 0) || // 'list' is default list command // not 1 letter command: 'language' or 'list'?
+	else if ((strncmp(command, "list", 2) == 0 && strncmp(command, "list", strlen(command)) == 0) || // 'list' is default list command // not 1 letter command: 'list'?
 	         strcmp(command,   "ls") == 0)
 		strcpy(command, "list");
 	else if ((strncmp(command, "listban", 5) == 0 && strncmp(command, "listban", strlen(command)) == 0) ||
@@ -567,7 +481,7 @@ int check_command(char * command)
 //-----------------------------------------
 // Sub-function: Display commands of ladmin
 //-----------------------------------------
-void display_help(char* param, int language)
+void display_help(char* param)
 {
 	char command[1023];
 	int i;
@@ -577,12 +491,8 @@ void display_help(char* param, int language)
 	if (sscanf(param, "%s ", command) < 1 || strlen(command) == 0)
 		strcpy(command, ""); // any value that is not a command
 
-	if (command[0] == '?') {
-		if (defaultlanguage == 'F')
-			strcpy(command, "aide");
-		else
-			strcpy(command, "help");
-	}
+	if (command[0] == '?')
+		strcpy(command, "help");
 
 	// lowercase for command
 	for (i = 0; command[i]; i++)
@@ -591,503 +501,242 @@ void display_help(char* param, int language)
 	// Analyse of the command
 	check_command(command); // give complete name to the command
 
-	if (defaultlanguage == 'F') {
-		ladmin_log("Affichage des commandes ou d'une commande.\n");
-	} else {
-		ladmin_log("Displaying of the commands or a command.\n");
-	}
+	ladmin_log("Displaying of the commands or a command.\n");
 
-	if (language == 1) {
-		if (strcmp(command, "aide") == 0) {
-			ShowMessage("aide/help/?\n");
-			ShowMessage("  Affiche la description des commandes\n");
-			ShowMessage("aide/help/? [commande]\n");
-			ShowMessage("  Affiche la description de la commande specifi馥\n");
-		} else if (strcmp(command, "help") == 0 ) {
-			ShowMessage("aide/help/?\n");
-			ShowMessage("  Display the description of the commands\n");
-			ShowMessage("aide/help/? [command]\n");
-			ShowMessage("  Display the description of the specified command\n");
+	if (strcmp(command, "help") == 0 ) {
+		ShowMessage("aide/help/?\n");
+		ShowMessage("  Display the description of the commands\n");
+		ShowMessage("aide/help/? [command]\n");
+		ShowMessage("  Display the description of the specified command\n");
 // general commands
-		} else if (strcmp(command, "add") == 0) {
-			ShowMessage("add <nomcompte> <sexe> <motdepasse>\n");
-			ShowMessage("  Cr馥 un compte avec l'email par d馭aut (a@a.com).\n");
-			ShowMessage("  Concernant le sexe, seule la premi鑽e lettre compte (F ou M).\n");
-			ShowMessage("  L'e-mail est a@a.com (e-mail par d馭aut). C'est comme n'avoir aucun e-mail.\n");
-			ShowMessage("  Lorsque motdepasse est omis, la saisie se fait sans que la frappe se voit.\n");
-			ShowMessage("  <exemple> add testname Male testpass\n");
-		} else if (strcmp(command, "ban") == 0) {
-			ShowMessage("ban/banish aaaa/mm/jj hh:mm:ss <nom compte>\n");
-			ShowMessage("  Change la date de fin de bannissement d'un compte.\n");
-			ShowMessage("  Comme banset, mais <nom compte> est � la fin.\n");
-		} else if (strcmp(command, "banadd") == 0) {
-			ShowMessage("banadd <nomcompte> <Modificateur>\n");
-			ShowMessage("  Ajoute ou soustrait du temps � la date de banissement d'un compte.\n");
-			ShowMessage("  Les modificateurs sont construits comme suit:\n");
-			ShowMessage("    Valeur d'ajustement (-1, 1, +1, etc...)\n");
-			ShowMessage("    El駑ent modifi�:\n");
-			ShowMessage("      a ou y: ann馥\n");
-			ShowMessage("      m:      mois\n");
-			ShowMessage("      j ou d: jour\n");
-			ShowMessage("      h:      heure\n");
-			ShowMessage("      mn:     minute\n");
-			ShowMessage("      s:      seconde\n");
-			ShowMessage("  <exemple> banadd testname +1m-2mn1s-6a\n");
-			ShowMessage("            Cette exemple ajoute 1 mois et une seconde, et soustrait 2 minutes\n");
-			ShowMessage("            et 6 ans dans le m麥e temps.\n");
-			ShowMessage("NOTE: Si vous modifez la date de banissement d'un compte non bani,\n");
-			ShowMessage("      vous indiquez comme date (le moment actuel +- les ajustements)\n");
-		} else if (strcmp(command, "banset") == 0) {
-			ShowMessage("banset <nomcompte> aaaa/mm/jj [hh:mm:ss]\n");
-			ShowMessage("  Change la date de fin de bannissement d'un compte.\n");
-			ShowMessage("  Heure par d馭aut [hh:mm:ss]: 23:59:59.\n");
-			ShowMessage("banset <nomcompte> 0\n");
-			ShowMessage("  D饕anni un compte (0 = de-banni).\n");
-		} else if (strcmp(command, "block") == 0) {
-			ShowMessage("block <nom compte>\n");
-			ShowMessage("  Place le status d'un compte � 5 (You have been blocked by the GM Team).\n");
-			ShowMessage("  La commande est l'駲uivalent de state <nom_compte> 5.\n");
-		} else if (strcmp(command, "check") == 0) {
-			ShowMessage("check <nomcompte> <motdepasse>\n");
-			ShowMessage("  V駻ifie la validit� d'un mot de passe pour un compte\n");
-			ShowMessage("  NOTE: Le serveur n'enverra jamais un mot de passe.\n");
-			ShowMessage("        C'est la seule m騁hode que vous poss馘ez pour savoir\n");
-			ShowMessage("        si un mot de passe est le bon. L'autre m騁hode est\n");
-			ShowMessage("        d'avoir un acc鑚 ('physique') au fichier des comptes.\n");
-		} else if (strcmp(command, "create") == 0) {
-			ShowMessage("create <nomcompte> <sexe> <email> <motdepasse>\n");
-			ShowMessage("  Comme la commande add, mais avec l'e-mail en plus.\n");
-			ShowMessage("  <exemple> create testname Male mon@mail.com testpass\n");
-		} else if (strcmp(command, "delete") == 0) {
-			ShowMessage("del <nom compte>\n");
-			ShowMessage("  Supprime un compte.\n");
-			ShowMessage("  La commande demande confirmation. Apr鑚 confirmation, le compte est d騁ruit.\n");
-		} else if (strcmp(command, "email") == 0) {
-			ShowMessage("email <nomcompte> <email>\n");
-			ShowMessage("  Modifie l'e-mail d'un compte.\n");
-		} else if (strcmp(command, "getcount") == 0) {
-			ShowMessage("getcount\n");
-			ShowMessage("  Donne le nombre de joueurs en ligne par serveur de char.\n");
-		} else if (strcmp(command, "gm") == 0) {
-			ShowMessage("gm <nomcompte> [Niveau_GM]\n");
-			ShowMessage("  Modifie le niveau de GM d'un compte.\n");
-			ShowMessage("  Valeur par d馭aut: 0 (suppression du niveau de GM).\n");
-			ShowMessage("  <exemple> gm nomtest 80\n");
-		} else if (strcmp(command, "id") == 0) {
-			ShowMessage("id <nom compte>\n");
-			ShowMessage("  Donne l'id d'un compte.\n");
-		} else if (strcmp(command, "info") == 0) {
-			ShowMessage("info <idcompte>\n");
-			ShowMessage("  Affiche les informations sur un compte.\n");
-		} else if (strcmp(command, "kami") == 0) {
-			ShowMessage("kami <message>\n");
-			ShowMessage("  Envoi un message g駭駻al sur tous les serveurs de map (en jaune).\n");
-		} else if (strcmp(command, "kamib") == 0) {
-			ShowMessage("kamib <message>\n");
-			ShowMessage("  Envoi un message g駭駻al sur tous les serveurs de map (en bleu).\n");
-		} else if (strcmp(command, "language") == 0) {
-			ShowMessage("language <langue>\n");
-			ShowMessage("  Change la langue d'affichage.\n");
-			ShowMessage("  Langues possibles: 'Fran軋is' ou 'English'.\n");
-		} else if (strcmp(command, "list") == 0) {
-			ShowMessage("list/ls [Premier_id [Dernier_id]]\n");
-			ShowMessage("  Affiche une liste de comptes.\n");
-			ShowMessage("  'Premier_id', 'Dernier_id': indique les identifiants de d駱art et de fin.\n");
-			ShowMessage("  La recherche par nom n'est pas possible avec cette commande.\n");
-			ShowMessage("  <example> list 10 9999999\n");
-		} else if (strcmp(command, "listban") == 0) {
-			ShowMessage("listBan/lsBan [Premier_id [Dernier_id]]\n");
-			ShowMessage("  Comme list/ls, mais seulement pour les comptes avec statut ou bannis.\n");
-		} else if (strcmp(command, "listgm") == 0) {
-			ShowMessage("listGM/lsGM [Premier_id [Dernier_id]]\n");
-			ShowMessage("  Comme list/ls, mais seulement pour les comptes GM.\n");
-		} else if (strcmp(command, "listok") == 0) {
-			ShowMessage("listOK/lsOK [Premier_id [Dernier_id]]\n");
-			ShowMessage("  Comme list/ls, mais seulement pour les comptes sans statut et non bannis.\n");
-		} else if (strcmp(command, "memo") == 0) {
-			ShowMessage("memo <nomcompte> <memo>\n");
-			ShowMessage("  Modifie le m駑o d'un compte.\n");
-			ShowMessage("  'memo': Il peut avoir jusqu'� 253 caract鑽es (avec des espaces ou non).\n");
-		} else if (strcmp(command, "name") == 0) {
-			ShowMessage("name <idcompte>\n");
-			ShowMessage("  Donne le nom d'un compte.\n");
-		} else if (strcmp(command, "password") == 0) {
-			ShowMessage("passwd <nomcompte> <nouveaumotdepasse>\n");
-			ShowMessage("  Change le mot de passe d'un compte.\n");
-			ShowMessage("  Lorsque nouveaumotdepasse est omis,\n");
-			ShowMessage("  la saisie se fait sans que la frappe ne se voit.\n");
-		} else if (strcmp(command, "reloadgm") == 0) {
-			ShowMessage("reloadGM\n");
-			ShowMessage("  Reload GM configuration file\n");
-		} else if (strcmp(command, "search") == 0) {
-			ShowMessage("search <expression>\n");
-			ShowMessage("  Cherche des comptes.\n");
-			ShowMessage("  Affiche les comptes dont les noms correspondent.\n");
-//			ShowMessage("search -r/-e/--expr/--regex <expression>\n");
-//			ShowMessage("  Cherche des comptes par expression reguli鑽e.\n");
-//			ShowMessage("  Affiche les comptes dont les noms correspondent.\n");
-		} else if (strcmp(command, "sex") == 0) {
-			ShowMessage("sex <nomcompte> <sexe>\n");
-			ShowMessage("  Modifie le sexe d'un compte.\n");
-			ShowMessage("  <exemple> sex testname Male\n");
-		} else if (strcmp(command, "state") == 0) {
-			ShowMessage("state <nomcompte> <nouveaustatut> <message_erreur_7>\n");
-			ShowMessage("  Change le statut d'un compte.\n");
-			ShowMessage("  'nouveaustatut': Le statut est le m麥e que celui du packet 0x006a + 1.\n");
-			ShowMessage("               les possibilit駸 sont:\n");
-			ShowMessage("               0 = Compte ok\n");
-			ShowMessage("               1 = Unregistered ID\n");
-			ShowMessage("               2 = Incorrect Password\n");
-			ShowMessage("               3 = This ID is expired\n");
-			ShowMessage("               4 = Rejected from Server\n");
-			ShowMessage("               5 = You have been blocked by the GM Team\n");
-			ShowMessage("               6 = Your Game's EXE file is not the latest version\n");
-			ShowMessage("               7 = You are Prohibited to log in until...\n");
-			ShowMessage("               8 = Server is jammed due to over populated\n");
-			ShowMessage("               9 = No MSG\n");
-			ShowMessage("               100 = This ID has been totally erased\n");
-			ShowMessage("               all other values are 'No MSG', then use state 9 please.\n");
-			ShowMessage("  'message_erreur_7': message du code erreur 6 =\n");
-			ShowMessage("                      = Your are Prohibited to log in until... (packet 0x006a)\n");
-		} else if (strcmp(command, "timeadd") == 0) {
-			ShowMessage("timeadd <nomcompte> <modificateur>\n");
-			ShowMessage("  Ajoute/soustrait du temps � la limite de validit� d'un compte.\n");
-			ShowMessage("  Le modificateur est compos� comme suit:\n");
-			ShowMessage("    Valeur modificatrice (-1, 1, +1, etc...)\n");
-			ShowMessage("    El駑ent modifi�:\n");
-			ShowMessage("      a ou y: ann馥\n");
-			ShowMessage("      m:      mois\n");
-			ShowMessage("      j ou d: jour\n");
-			ShowMessage("      h:      heure\n");
-			ShowMessage("      mn:     minute\n");
-			ShowMessage("      s:      seconde\n");
-			ShowMessage("  <exemple> timeadd testname +1m-2mn1s-6a\n");
-			ShowMessage("            Cette exemple ajoute 1 mois et une seconde, et soustrait 2 minutes\n");
-			ShowMessage("            et 6 ans dans le m麥e temps.\n");
-			ShowMessage("NOTE: Vous ne pouvez pas modifier une limite de validit� illimit馥. Si vous\n");
-			ShowMessage("      d駸irez le faire, c'est que vous voulez probablement cr馥r un limite de\n");
-			ShowMessage("      validit� limit馥. Donc, en premier, fix� une limite de valitid�.\n");
-		} else if (strcmp(command, "timeadd") == 0) {
-			ShowMessage("timeset <nomcompte> aaaa/mm/jj [hh:mm:ss]\n");
-			ShowMessage("  Change la limite de validit� d'un compte.\n");
-			ShowMessage("  Heure par d馭aut [hh:mm:ss]: 23:59:59.\n");
-			ShowMessage("timeset <nomcompte> 0\n");
-			ShowMessage("  Donne une limite de validit� illimit馥 (0 = illimit馥).\n");
-		} else if (strcmp(command, "unban") == 0) {
-			ShowMessage("unban/unbanish <nom compte>\n");
-			ShowMessage("  Ote le banissement d'un compte.\n");
-			ShowMessage("  La commande est l'駲uivalent de banset <nom_compte> 0.\n");
-		} else if (strcmp(command, "unblock") == 0) {
-			ShowMessage("unblock <nom compte>\n");
-			ShowMessage("  Place le status d'un compte � 0 (Compte ok).\n");
-			ShowMessage("  La commande est l'駲uivalent de state <nom_compte> 0.\n");
-		} else if (strcmp(command, "version") == 0) {
-			ShowMessage("version\n");
-			ShowMessage("  Affiche la version du login-serveur.\n");
-		} else if (strcmp(command, "who") == 0) {
-			ShowMessage("who <nom compte>\n");
-			ShowMessage("  Affiche les informations sur un compte.\n");
-// quit
-		} else if (strcmp(command, "quit") == 0 ||
-		           strcmp(command, "exit") == 0 ||
-		           strcmp(command, "end") == 0) {
-			ShowMessage("quit/end/exit\n");
-			ShowMessage("  Fin du programme d'administration.\n");
-// unknown command
-		} else {
-			if (strlen(command) > 0)
-				ShowMessage("Commande inconnue [%s] pour l'aide. Affichage de toutes les commandes.\n", command);
-			ShowMessage(" aide/help/?                             -- Affiche cet aide\n");
-			ShowMessage(" aide/help/? [commande]                  -- Affiche l'aide de la commande\n");
-			ShowMessage(" add <nomcompte> <sexe> <motdepasse>     -- Cr馥 un compte (sans email)\n");
-			ShowMessage(" ban/banish aaaa/mm/jj hh:mm:ss <nom compte> -- Fixe la date finale de banismnt\n");
-			ShowMessage(" banadd/ba <nomcompte> <modificateur>    -- Ajout/soustrait du temps � la\n");
-			ShowMessage("   exemple: ba moncompte +1m-2mn1s-2y       date finale de banissement\n");
-			ShowMessage(" banset/bs <nomcompte> aaaa/mm/jj [hh:mm:ss] -- Change la date fin de banisemnt\n");
-			ShowMessage(" banset/bs <nomcompte> 0                 -- D�-banis un compte.\n");
-			ShowMessage(" block <nom compte>  -- Mets le status d'un compte � 5 (blocked by the GM Team)\n");
-			ShowMessage(" check <nomcompte> <motdepasse>          -- V駻ifie un mot de passe d'un compte\n");
-			ShowMessage(" create <nomcompte> <sexe> <email> <motdepasse> -- Cr馥 un compte (avec email)\n");
-			ShowMessage(" del <nom compte>                        -- Supprime un compte\n");
-			ShowMessage(" email <nomcompte> <email>               -- Modifie l'e-mail d'un compte\n");
-			ShowMessage(" getcount                                -- Donne le nb de joueurs en ligne\n");
-			ShowMessage("  gm <nomcompte> [Niveau_GM]              -- Modifie le niveau de GM d'un compte\n");
-			ShowMessage(" id <nom compte>                         -- Donne l'id d'un compte\n");
-			ShowMessage(" info <idcompte>                         -- Affiche les infos sur un compte\n");
-			ShowMessage(" kami <message>                          -- Envoi un message g駭駻al (en jaune)\n");
-			ShowMessage(" kamib <message>                         -- Envoi un message g駭駻al (en bleu)\n");
-			ShowMessage(" language <langue>                       -- Change la langue d'affichage.\n");
-			ShowMessage(" list/ls [Premier_id [Dernier_id] ]      -- Affiche une liste de comptes\n");
-			ShowMessage(" listBan/lsBan [Premier_id [Dernier_id] ] -- Affiche une liste de comptes\n");
-			ShowMessage("                                             avec un statut ou bannis\n");
-			ShowMessage(" listGM/lsGM [Premier_id [Dernier_id] ]  -- Affiche une liste de comptes GM\n");
-			ShowMessage(" listOK/lsOK [Premier_id [Dernier_id] ]  -- Affiche une liste de comptes\n");
-			ShowMessage("                                            sans status et non bannis\n");
-			ShowMessage(" memo <nomcompte> <memo>                 -- Modifie le memo d'un compte\n");
-			ShowMessage(" name <idcompte>                         -- Donne le nom d'un compte\n");
-			ShowMessage(" passwd <nomcompte> <nouveaumotdepasse>  -- Change le mot de passe d'un compte\n");
-			ShowMessage(" quit/end/exit                           -- Fin du programme d'administation\n");
-			ShowMessage(" reloadGM                              -- Recharger le fichier de config des GM\n");
-			ShowMessage(" search <expression>                     -- Cherche des comptes\n");
-//			ShowMessage(" search -e/-r/--expr/--regex <expression> -- Cherche des comptes par REGEX\n");
-			ShowMessage(" sex <nomcompte> <sexe>                  -- Modifie le sexe d'un compte\n");
-			ShowMessage(" state <nomcompte> <nouveaustatut> <messageerr7> -- Change le statut d'1 compte\n");
-			ShowMessage(" timeadd/ta <nomcompte> <modificateur>   -- Ajout/soustrait du temps � la\n");
-			ShowMessage("   exemple: ta moncompte +1m-2mn1s-2y       limite de validit饅n");
-			ShowMessage(" timeset/ts <nomcompte> aaaa/mm/jj [hh:mm:ss] -- Change la limite de validit饅n");
-			ShowMessage(" timeset/ts <nomcompte> 0                -- limite de validit� = illimit馥\n");
-			ShowMessage(" unban/unbanish <nom compte>             -- Ote le banissement d'un compte\n");
-			ShowMessage(" unblock <nom compte>             -- Mets le status d'un compte � 0 (Compte ok)\n");
-			ShowMessage(" version                                 -- Donne la version du login-serveur\n");
-			ShowMessage(" who <nom compte>                        -- Affiche les infos sur un compte\n");
-			ShowMessage(" Note: Pour les noms de compte avec des espaces, tapez \"<nom compte>\" (ou ').\n");
-		}
-	} else {
-		if (strcmp(command, "aide") == 0) {
-			ShowMessage("aide/help/?\n");
-			ShowMessage("  Display the description of the commands\n");
-			ShowMessage("aide/help/? [command]\n");
-			ShowMessage("  Display the description of the specified command\n");
-		} else if (strcmp(command, "help") == 0 ) {
-			ShowMessage("aide/help/?\n");
-			ShowMessage("  Display the description of the commands\n");
-			ShowMessage("aide/help/? [command]\n");
-			ShowMessage("  Display the description of the specified command\n");
-// general commands
-		} else if (strcmp(command, "add") == 0) {
-			ShowMessage("add <account_name> <sex> <password>\n");
-			ShowMessage("  Create an account with the default email (a@a.com).\n");
-			ShowMessage("  Concerning the sex, only the first letter is used (F or M).\n");
-			ShowMessage("  The e-mail is set to a@a.com (default e-mail). It's like to have no e-mail.\n");
-			ShowMessage("  When the password is omitted,\n");
-			ShowMessage("  the input is done without displaying of the pressed keys.\n");
-			ShowMessage("  <example> add testname Male testpass\n");
-		} else if (strcmp(command, "ban") == 0) {
-			ShowMessage("ban/banish yyyy/mm/dd hh:mm:ss <account name>\n");
-			ShowMessage("  Changes the final date of a banishment of an account.\n");
-			ShowMessage("  Like banset, but <account name> is at end.\n");
-		} else if (strcmp(command, "banadd") == 0) {
-			ShowMessage("banadd <account_name> <modifier>\n");
-			ShowMessage("  Adds or substracts time from the final date of a banishment of an account.\n");
-			ShowMessage("  Modifier is done as follows:\n");
-			ShowMessage("    Adjustment value (-1, 1, +1, etc...)\n");
-			ShowMessage("    Modified element:\n");
-			ShowMessage("      a or y: year\n");
-			ShowMessage("      m:  month\n");
-			ShowMessage("      j or d: day\n");
-			ShowMessage("      h:  hour\n");
-			ShowMessage("      mn: minute\n");
-			ShowMessage("      s:  second\n");
-			ShowMessage("  <example> banadd testname +1m-2mn1s-6y\n");
-			ShowMessage("            this example adds 1 month and 1 second, and substracts 2 minutes\n");
-			ShowMessage("            and 6 years at the same time.\n");
-			ShowMessage("NOTE: If you modify the final date of a non-banished account,\n");
-			ShowMessage("      you fix the final date to (actual time +- adjustments)\n");
-		} else if (strcmp(command, "banset") == 0) {
-			ShowMessage("banset <account_name> yyyy/mm/dd [hh:mm:ss]\n");
-			ShowMessage("  Changes the final date of a banishment of an account.\n");
-			ShowMessage("  Default time [hh:mm:ss]: 23:59:59.\n");
-			ShowMessage("banset <account_name> 0\n");
-			ShowMessage("  Set a non-banished account (0 = unbanished).\n");
-		} else if (strcmp(command, "block") == 0) {
-			ShowMessage("block <account name>\n");
-			ShowMessage("  Set state 5 (You have been blocked by the GM Team) to an account.\n");
-			ShowMessage("  This command works like state <account_name> 5.\n");
-		} else if (strcmp(command, "check") == 0) {
-			ShowMessage("check <account_name> <password>\n");
-			ShowMessage("  Check the validity of a password for an account.\n");
-			ShowMessage("  NOTE: Server will never send back a password.\n");
-			ShowMessage("        It's the only method you have to know if a password is correct.\n");
-			ShowMessage("        The other method is to have a ('physical') access to the accounts file.\n");
-		} else if (strcmp(command, "create") == 0) {
-			ShowMessage("create <account_name> <sex> <email> <password>\n");
-			ShowMessage("  Like the 'add' command, but with e-mail moreover.\n");
-			ShowMessage("  <example> create testname Male my@mail.com testpass\n");
-		} else if (strcmp(command, "delete") == 0) {
-			ShowMessage("del <account name>\n");
-			ShowMessage("  Remove an account.\n");
-			ShowMessage("  This order requires confirmation. After confirmation, the account is deleted.\n");
-		} else if (strcmp(command, "email") == 0) {
-			ShowMessage("email <account_name> <email>\n");
-			ShowMessage("  Modify the e-mail of an account.\n");
-		} else if (strcmp(command, "getcount") == 0) {
-			ShowMessage("getcount\n");
-			ShowMessage("  Give the number of players online on all char-servers.\n");
-		} else if (strcmp(command, "gm") == 0) {
-			ShowMessage("gm <account_name> [GM_level]\n");
-			ShowMessage("  Modify the GM level of an account.\n");
-			ShowMessage("  Default value remove GM level (GM level = 0).\n");
-			ShowMessage("  <example> gm testname 80\n");
-		} else if (strcmp(command, "id") == 0) {
-			ShowMessage("id <account name>\n");
-			ShowMessage("  Give the id of an account.\n");
-		} else if (strcmp(command, "info") == 0) {
-			ShowMessage("info <account_id>\n");
-			ShowMessage("  Display complete information of an account.\n");
-		} else if (strcmp(command, "kami") == 0) {
-			ShowMessage("kami <message>\n");
-			ShowMessage("  Sends a broadcast message on all map-server (in yellow).\n");
-		} else if (strcmp(command, "kamib") == 0) {
-			ShowMessage("kamib <message>\n");
-			ShowMessage("  Sends a broadcast message on all map-server (in blue).\n");
-		} else if (strcmp(command, "language") == 0) {
-			ShowMessage("language <language>\n");
-			ShowMessage("  Change the language of displaying.\n");
-			ShowMessage("  Possible languages: Fran軋is or English.\n");
-		} else if (strcmp(command, "list") == 0) {
-			ShowMessage("list/ls [start_id [end_id]]\n");
-			ShowMessage("  Display a list of accounts.\n");
-			ShowMessage("  'start_id', 'end_id': indicate end and start identifiers.\n");
-			ShowMessage("  Research by name is not possible with this command.\n");
-			ShowMessage("  <example> list 10 9999999\n");
-		} else if (strcmp(command, "listban") == 0) {
-			ShowMessage("listBan/lsBan [start_id [end_id]]\n");
-			ShowMessage("  Like list/ls, but only for accounts with state or banished.\n");
-		} else if (strcmp(command, "listgm") == 0) {
-			ShowMessage("listGM/lsGM [start_id [end_id]]\n");
-			ShowMessage("  Like list/ls, but only for GM accounts.\n");
-		} else if (strcmp(command, "listok") == 0) {
-			ShowMessage("listOK/lsOK [start_id [end_id]]\n");
-			ShowMessage("  Like list/ls, but only for accounts without state and not banished.\n");
-		} else if (strcmp(command, "memo") == 0) {
-			ShowMessage("memo <account_name> <memo>\n");
-			ShowMessage("  Modify the memo of an account.\n");
-			ShowMessage("  'memo': it can have until 253 characters (with spaces or not).\n");
-		} else if (strcmp(command, "name") == 0) {
-			ShowMessage("name <account_id>\n");
-			ShowMessage("  Give the name of an account.\n");
-		} else if (strcmp(command, "password") == 0) {
-			ShowMessage("passwd <account_name> <new_password>\n");
-			ShowMessage("  Change the password of an account.\n");
-			ShowMessage("  When new password is omitted,\n");
-			ShowMessage("  the input is done without displaying of the pressed keys.\n");
-		} else if (strcmp(command, "reloadgm") == 0) {
-			ShowMessage("reloadGM\n");
-			ShowMessage("  Reload GM configuration file\n");
-		} else if (strcmp(command, "search") == 0) {
-			ShowMessage("search <expression>\n");
-			ShowMessage("  Seek accounts.\n");
-			ShowMessage("  Displays the accounts whose names correspond.\n");
+	} else if (strcmp(command, "add") == 0) {
+		ShowMessage("add <account_name> <sex> <password>\n");
+		ShowMessage("  Create an account with the default email (a@a.com).\n");
+		ShowMessage("  Concerning the sex, only the first letter is used (F or M).\n");
+		ShowMessage("  The e-mail is set to a@a.com (default e-mail). It's like to have no e-mail.\n");
+		ShowMessage("  When the password is omitted,\n");
+		ShowMessage("  the input is done without displaying of the pressed keys.\n");
+		ShowMessage("  <example> add testname Male testpass\n");
+	} else if (strcmp(command, "ban") == 0) {
+		ShowMessage("ban/banish yyyy/mm/dd hh:mm:ss <account name>\n");
+		ShowMessage("  Changes the final date of a banishment of an account.\n");
+		ShowMessage("  Like banset, but <account name> is at end.\n");
+	} else if (strcmp(command, "banadd") == 0) {
+		ShowMessage("banadd <account_name> <modifier>\n");
+		ShowMessage("  Adds or substracts time from the final date of a banishment of an account.\n");
+		ShowMessage("  Modifier is done as follows:\n");
+		ShowMessage("    Adjustment value (-1, 1, +1, etc...)\n");
+		ShowMessage("    Modified element:\n");
+		ShowMessage("      a or y: year\n");
+		ShowMessage("      m:  month\n");
+		ShowMessage("      j or d: day\n");
+		ShowMessage("      h:  hour\n");
+		ShowMessage("      mn: minute\n");
+		ShowMessage("      s:  second\n");
+		ShowMessage("  <example> banadd testname +1m-2mn1s-6y\n");
+		ShowMessage("            this example adds 1 month and 1 second, and substracts 2 minutes\n");
+		ShowMessage("            and 6 years at the same time.\n");
+		ShowMessage("NOTE: If you modify the final date of a non-banished account,\n");
+		ShowMessage("      you fix the final date to (actual time +- adjustments)\n");
+	} else if (strcmp(command, "banset") == 0) {
+		ShowMessage("banset <account_name> yyyy/mm/dd [hh:mm:ss]\n");
+		ShowMessage("  Changes the final date of a banishment of an account.\n");
+		ShowMessage("  Default time [hh:mm:ss]: 23:59:59.\n");
+		ShowMessage("banset <account_name> 0\n");
+		ShowMessage("  Set a non-banished account (0 = unbanished).\n");
+	} else if (strcmp(command, "block") == 0) {
+		ShowMessage("block <account name>\n");
+		ShowMessage("  Set state 5 (You have been blocked by the GM Team) to an account.\n");
+		ShowMessage("  This command works like state <account_name> 5.\n");
+	} else if (strcmp(command, "check") == 0) {
+		ShowMessage("check <account_name> <password>\n");
+		ShowMessage("  Check the validity of a password for an account.\n");
+		ShowMessage("  NOTE: Server will never send back a password.\n");
+		ShowMessage("        It's the only method you have to know if a password is correct.\n");
+		ShowMessage("        The other method is to have a ('physical') access to the accounts file.\n");
+	} else if (strcmp(command, "create") == 0) {
+		ShowMessage("create <account_name> <sex> <email> <password>\n");
+		ShowMessage("  Like the 'add' command, but with e-mail moreover.\n");
+		ShowMessage("  <example> create testname Male my@mail.com testpass\n");
+	} else if (strcmp(command, "delete") == 0) {
+		ShowMessage("del <account name>\n");
+		ShowMessage("  Remove an account.\n");
+		ShowMessage("  This order requires confirmation. After confirmation, the account is deleted.\n");
+	} else if (strcmp(command, "email") == 0) {
+		ShowMessage("email <account_name> <email>\n");
+		ShowMessage("  Modify the e-mail of an account.\n");
+	} else if (strcmp(command, "getcount") == 0) {
+		ShowMessage("getcount\n");
+		ShowMessage("  Give the number of players online on all char-servers.\n");
+	} else if (strcmp(command, "gm") == 0) {
+		ShowMessage("gm <account_name> [GM_level]\n");
+		ShowMessage("  Modify the GM level of an account.\n");
+		ShowMessage("  Default value remove GM level (GM level = 0).\n");
+		ShowMessage("  <example> gm testname 80\n");
+	} else if (strcmp(command, "id") == 0) {
+		ShowMessage("id <account name>\n");
+		ShowMessage("  Give the id of an account.\n");
+	} else if (strcmp(command, "info") == 0) {
+		ShowMessage("info <account_id>\n");
+		ShowMessage("  Display complete information of an account.\n");
+	} else if (strcmp(command, "kami") == 0) {
+		ShowMessage("kami <message>\n");
+		ShowMessage("  Sends a broadcast message on all map-server (in yellow).\n");
+	} else if (strcmp(command, "kamib") == 0) {
+		ShowMessage("kamib <message>\n");
+		ShowMessage("  Sends a broadcast message on all map-server (in blue).\n");
+	} else if (strcmp(command, "list") == 0) {
+		ShowMessage("list/ls [start_id [end_id]]\n");
+		ShowMessage("  Display a list of accounts.\n");
+		ShowMessage("  'start_id', 'end_id': indicate end and start identifiers.\n");
+		ShowMessage("  Research by name is not possible with this command.\n");
+		ShowMessage("  <example> list 10 9999999\n");
+	} else if (strcmp(command, "listban") == 0) {
+		ShowMessage("listBan/lsBan [start_id [end_id]]\n");
+		ShowMessage("  Like list/ls, but only for accounts with state or banished.\n");
+	} else if (strcmp(command, "listgm") == 0) {
+		ShowMessage("listGM/lsGM [start_id [end_id]]\n");
+		ShowMessage("  Like list/ls, but only for GM accounts.\n");
+	} else if (strcmp(command, "listok") == 0) {
+		ShowMessage("listOK/lsOK [start_id [end_id]]\n");
+		ShowMessage("  Like list/ls, but only for accounts without state and not banished.\n");
+	} else if (strcmp(command, "memo") == 0) {
+		ShowMessage("memo <account_name> <memo>\n");
+		ShowMessage("  Modify the memo of an account.\n");
+		ShowMessage("  'memo': it can have until 253 characters (with spaces or not).\n");
+	} else if (strcmp(command, "name") == 0) {
+		ShowMessage("name <account_id>\n");
+		ShowMessage("  Give the name of an account.\n");
+	} else if (strcmp(command, "password") == 0) {
+		ShowMessage("passwd <account_name> <new_password>\n");
+		ShowMessage("  Change the password of an account.\n");
+		ShowMessage("  When new password is omitted,\n");
+		ShowMessage("  the input is done without displaying of the pressed keys.\n");
+	} else if (strcmp(command, "reloadgm") == 0) {
+		ShowMessage("reloadGM\n");
+		ShowMessage("  Reload GM configuration file\n");
+	} else if (strcmp(command, "search") == 0) {
+		ShowMessage("search <expression>\n");
+		ShowMessage("  Seek accounts.\n");
+		ShowMessage("  Displays the accounts whose names correspond.\n");
 //			ShowMessage("search -r/-e/--expr/--regex <expression>\n");
 //			ShowMessage("  Seek accounts by regular expression.\n");
 //			ShowMessage("  Displays the accounts whose names correspond.\n");
-		} else if (strcmp(command, "sex") == 0) {
-			ShowMessage("sex <account_name> <sex>\n");
-			ShowMessage("  Modify the sex of an account.\n");
-			ShowMessage("  <example> sex testname Male\n");
-		} else if (strcmp(command, "state") == 0) {
-			ShowMessage("state <account_name> <new_state> <error_message_#7>\n");
-			ShowMessage("  Change the state of an account.\n");
-			ShowMessage("  'new_state': state is the state of the packet 0x006a + 1.\n");
-			ShowMessage("               The possibilities are:\n");
-			ShowMessage("               0 = Account ok\n");
-			ShowMessage("               1 = Unregistered ID\n");
-			ShowMessage("               2 = Incorrect Password\n");
-			ShowMessage("               3 = This ID is expired\n");
-			ShowMessage("               4 = Rejected from Server\n");
-			ShowMessage("               5 = You have been blocked by the GM Team\n");
-			ShowMessage("               6 = Your Game's EXE file is not the latest version\n");
-			ShowMessage("               7 = You are Prohibited to log in until...\n");
-			ShowMessage("               8 = Server is jammed due to over populated\n");
-			ShowMessage("               9 = No MSG\n");
-			ShowMessage("               100 = This ID has been totally erased\n");
-			ShowMessage("               all other values are 'No MSG', then use state 9 please.\n");
-			ShowMessage("  'error_message_#7': message of the code error 6\n");
-			ShowMessage("                      = Your are Prohibited to log in until... (packet 0x006a)\n");
-		} else if (strcmp(command, "timeadd") == 0) {
-			ShowMessage("timeadd <account_name> <modifier>\n");
-			ShowMessage("  Adds or substracts time from the validity limit of an account.\n");
-			ShowMessage("  Modifier is done as follows:\n");
-			ShowMessage("    Adjustment value (-1, 1, +1, etc...)\n");
-			ShowMessage("    Modified element:\n");
-			ShowMessage("      a or y: year\n");
-			ShowMessage("      m:  month\n");
-			ShowMessage("      j or d: day\n");
-			ShowMessage("      h:  hour\n");
-			ShowMessage("      mn: minute\n");
-			ShowMessage("      s:  second\n");
-			ShowMessage("  <example> timeadd testname +1m-2mn1s-6y\n");
-			ShowMessage("            this example adds 1 month and 1 second, and substracts 2 minutes\n");
-			ShowMessage("            and 6 years at the same time.\n");
-			ShowMessage("NOTE: You can not modify a unlimited validity limit.\n");
-			ShowMessage("      If you want modify it, you want probably create a limited validity limit.\n");
-			ShowMessage("      So, at first, you must set the validity limit to a date/time.\n");
-		} else if (strcmp(command, "timeadd") == 0) {
-			ShowMessage("timeset <account_name> yyyy/mm/dd [hh:mm:ss]\n");
-			ShowMessage("  Changes the validity limit of an account.\n");
-			ShowMessage("  Default time [hh:mm:ss]: 23:59:59.\n");
-			ShowMessage("timeset <account_name> 0\n");
-			ShowMessage("  Gives an unlimited validity limit (0 = unlimited).\n");
-		} else if (strcmp(command, "unban") == 0) {
-			ShowMessage("unban/unbanish <account name>\n");
-			ShowMessage("  Remove the banishment of an account.\n");
-			ShowMessage("  This command works like banset <account_name> 0.\n");
-		} else if (strcmp(command, "unblock") == 0) {
-			ShowMessage("unblock <account name>\n");
-			ShowMessage("  Set state 0 (Account ok) to an account.\n");
-			ShowMessage("  This command works like state <account_name> 0.\n");
-		} else if (strcmp(command, "version") == 0) {
-			ShowMessage("version\n");
-			ShowMessage("  Display the version of the login-server.\n");
-		} else if (strcmp(command, "who") == 0) {
-			ShowMessage("who <account name>\n");
-			ShowMessage("  Displays complete information of an account.\n");
+	} else if (strcmp(command, "sex") == 0) {
+		ShowMessage("sex <account_name> <sex>\n");
+		ShowMessage("  Modify the sex of an account.\n");
+		ShowMessage("  <example> sex testname Male\n");
+	} else if (strcmp(command, "state") == 0) {
+		ShowMessage("state <account_name> <new_state> <error_message_#7>\n");
+		ShowMessage("  Change the state of an account.\n");
+		ShowMessage("  'new_state': state is the state of the packet 0x006a + 1.\n");
+		ShowMessage("               The possibilities are:\n");
+		ShowMessage("               0 = Account ok\n");
+		ShowMessage("               1 = Unregistered ID\n");
+		ShowMessage("               2 = Incorrect Password\n");
+		ShowMessage("               3 = This ID is expired\n");
+		ShowMessage("               4 = Rejected from Server\n");
+		ShowMessage("               5 = You have been blocked by the GM Team\n");
+		ShowMessage("               6 = Your Game's EXE file is not the latest version\n");
+		ShowMessage("               7 = You are Prohibited to log in until...\n");
+		ShowMessage("               8 = Server is jammed due to over populated\n");
+		ShowMessage("               9 = No MSG\n");
+		ShowMessage("               100 = This ID has been totally erased\n");
+		ShowMessage("               all other values are 'No MSG', then use state 9 please.\n");
+		ShowMessage("  'error_message_#7': message of the code error 6\n");
+		ShowMessage("                      = Your are Prohibited to log in until... (packet 0x006a)\n");
+	} else if (strcmp(command, "timeadd") == 0) {
+		ShowMessage("timeadd <account_name> <modifier>\n");
+		ShowMessage("  Adds or substracts time from the validity limit of an account.\n");
+		ShowMessage("  Modifier is done as follows:\n");
+		ShowMessage("    Adjustment value (-1, 1, +1, etc...)\n");
+		ShowMessage("    Modified element:\n");
+		ShowMessage("      a or y: year\n");
+		ShowMessage("      m:  month\n");
+		ShowMessage("      j or d: day\n");
+		ShowMessage("      h:  hour\n");
+		ShowMessage("      mn: minute\n");
+		ShowMessage("      s:  second\n");
+		ShowMessage("  <example> timeadd testname +1m-2mn1s-6y\n");
+		ShowMessage("            this example adds 1 month and 1 second, and substracts 2 minutes\n");
+		ShowMessage("            and 6 years at the same time.\n");
+		ShowMessage("NOTE: You can not modify a unlimited validity limit.\n");
+		ShowMessage("      If you want modify it, you want probably create a limited validity limit.\n");
+		ShowMessage("      So, at first, you must set the validity limit to a date/time.\n");
+	} else if (strcmp(command, "timeadd") == 0) {
+		ShowMessage("timeset <account_name> yyyy/mm/dd [hh:mm:ss]\n");
+		ShowMessage("  Changes the validity limit of an account.\n");
+		ShowMessage("  Default time [hh:mm:ss]: 23:59:59.\n");
+		ShowMessage("timeset <account_name> 0\n");
+		ShowMessage("  Gives an unlimited validity limit (0 = unlimited).\n");
+	} else if (strcmp(command, "unban") == 0) {
+		ShowMessage("unban/unbanish <account name>\n");
+		ShowMessage("  Remove the banishment of an account.\n");
+		ShowMessage("  This command works like banset <account_name> 0.\n");
+	} else if (strcmp(command, "unblock") == 0) {
+		ShowMessage("unblock <account name>\n");
+		ShowMessage("  Set state 0 (Account ok) to an account.\n");
+		ShowMessage("  This command works like state <account_name> 0.\n");
+	} else if (strcmp(command, "version") == 0) {
+		ShowMessage("version\n");
+		ShowMessage("  Display the version of the login-server.\n");
+	} else if (strcmp(command, "who") == 0) {
+		ShowMessage("who <account name>\n");
+		ShowMessage("  Displays complete information of an account.\n");
 // quit
-		} else if (strcmp(command, "quit") == 0 ||
-		           strcmp(command, "exit") == 0 ||
-		           strcmp(command, "end") == 0) {
-			ShowMessage("quit/end/exit\n");
-			ShowMessage("  End of the program of administration.\n");
+	} else if (strcmp(command, "quit") == 0 ||
+	           strcmp(command, "exit") == 0 ||
+	           strcmp(command, "end") == 0) {
+		ShowMessage("quit/end/exit\n");
+		ShowMessage("  End of the program of administration.\n");
 // unknown command
-		} else {
-			if (strlen(command) > 0)
-				ShowMessage("Unknown command [%s] for help. Displaying of all commands.\n", command);
-			ShowMessage(" aide/help/?                          -- Display this help\n");
-			ShowMessage(" aide/help/? [command]                -- Display the help of the command\n");
-			ShowMessage(" add <account_name> <sex> <password>  -- Create an account with default email\n");
-			ShowMessage(" ban/banish yyyy/mm/dd hh:mm:ss <account name> -- Change final date of a ban\n");
-			ShowMessage(" banadd/ba <account_name> <modifier>  -- Add or substract time from the final\n");
-			ShowMessage("   example: ba apple +1m-2mn1s-2y        date of a banishment of an account\n");
-			ShowMessage(" banset/bs <account_name> yyyy/mm/dd [hh:mm:ss] -- Change final date of a ban\n");
-			ShowMessage(" banset/bs <account_name> 0           -- Un-banish an account\n");
-			ShowMessage(" block <account name>     -- Set state 5 (blocked by the GM Team) to an account\n");
-			ShowMessage(" check <account_name> <password>      -- Check the validity of a password\n");
-			ShowMessage(" create <account_name> <sex> <email> <passwrd> -- Create an account with email\n");
-			ShowMessage(" del <account name>                   -- Remove an account\n");
-			ShowMessage(" email <account_name> <email>         -- Modify an email of an account\n");
-			ShowMessage(" getcount                             -- Give the number of players online\n");
-			ShowMessage(" gm <account_name> [GM_level]         -- Modify the GM level of an account\n");
-			ShowMessage(" id <account name>                    -- Give the id of an account\n");
-			ShowMessage(" info <account_id>                    -- Display all information of an account\n");
-			ShowMessage(" kami <message>                       -- Sends a broadcast message (in yellow)\n");
-			ShowMessage(" kamib <message>                      -- Sends a broadcast message (in blue)\n");
-			ShowMessage(" language <language>                  -- Change the language of displaying.\n");
-			ShowMessage(" list/ls [First_id [Last_id]]         -- Display a list of accounts\n");
-			ShowMessage(" listBan/lsBan [First_id [Last_id] ]  -- Display a list of accounts\n");
-			ShowMessage("                                         with state or banished\n");
-			ShowMessage(" listGM/lsGM [First_id [Last_id]]     -- Display a list of GM accounts\n");
-			ShowMessage(" listOK/lsOK [First_id [Last_id] ]    -- Display a list of accounts\n");
-			ShowMessage("                                         without state and not banished\n");
-			ShowMessage(" memo <account_name> <memo>           -- Modify the memo of an account\n");
-			ShowMessage(" name <account_id>                    -- Give the name of an account\n");
-			ShowMessage(" passwd <account_name> <new_password> -- Change the password of an account\n");
-			ShowMessage(" quit/end/exit                        -- End of the program of administation\n");
-			ShowMessage(" reloadGM                             -- Reload GM configuration file\n");
-			ShowMessage(" search <expression>                  -- Seek accounts\n");
+	} else {
+		if (strlen(command) > 0)
+			ShowMessage("Unknown command [%s] for help. Displaying of all commands.\n", command);
+		ShowMessage(" aide/help/?                          -- Display this help\n");
+		ShowMessage(" aide/help/? [command]                -- Display the help of the command\n");
+		ShowMessage(" add <account_name> <sex> <password>  -- Create an account with default email\n");
+		ShowMessage(" ban/banish yyyy/mm/dd hh:mm:ss <account name> -- Change final date of a ban\n");
+		ShowMessage(" banadd/ba <account_name> <modifier>  -- Add or substract time from the final\n");
+		ShowMessage("   example: ba apple +1m-2mn1s-2y        date of a banishment of an account\n");
+		ShowMessage(" banset/bs <account_name> yyyy/mm/dd [hh:mm:ss] -- Change final date of a ban\n");
+		ShowMessage(" banset/bs <account_name> 0           -- Un-banish an account\n");
+		ShowMessage(" block <account name>     -- Set state 5 (blocked by the GM Team) to an account\n");
+		ShowMessage(" check <account_name> <password>      -- Check the validity of a password\n");
+		ShowMessage(" create <account_name> <sex> <email> <passwrd> -- Create an account with email\n");
+		ShowMessage(" del <account name>                   -- Remove an account\n");
+		ShowMessage(" email <account_name> <email>         -- Modify an email of an account\n");
+		ShowMessage(" getcount                             -- Give the number of players online\n");
+		ShowMessage(" gm <account_name> [GM_level]         -- Modify the GM level of an account\n");
+		ShowMessage(" id <account name>                    -- Give the id of an account\n");
+		ShowMessage(" info <account_id>                    -- Display all information of an account\n");
+		ShowMessage(" kami <message>                       -- Sends a broadcast message (in yellow)\n");
+		ShowMessage(" kamib <message>                      -- Sends a broadcast message (in blue)\n");
+		ShowMessage(" list/ls [First_id [Last_id]]         -- Display a list of accounts\n");
+		ShowMessage(" listBan/lsBan [First_id [Last_id] ]  -- Display a list of accounts\n");
+		ShowMessage("                                         with state or banished\n");
+		ShowMessage(" listGM/lsGM [First_id [Last_id]]     -- Display a list of GM accounts\n");
+		ShowMessage(" listOK/lsOK [First_id [Last_id] ]    -- Display a list of accounts\n");
+		ShowMessage("                                         without state and not banished\n");
+		ShowMessage(" memo <account_name> <memo>           -- Modify the memo of an account\n");
+		ShowMessage(" name <account_id>                    -- Give the name of an account\n");
+		ShowMessage(" passwd <account_name> <new_password> -- Change the password of an account\n");
+		ShowMessage(" quit/end/exit                        -- End of the program of administation\n");
+		ShowMessage(" reloadGM                             -- Reload GM configuration file\n");
+		ShowMessage(" search <expression>                  -- Seek accounts\n");
 //			ShowMessage(" search -e/-r/--expr/--regex <expressn> -- Seek accounts by regular-expression\n");
-			ShowMessage(" sex <nomcompte> <sexe>               -- Modify the sex of an account\n");
-			ShowMessage(" state <account_name> <new_state> <error_message_#7> -- Change the state\n");
-			ShowMessage(" timeadd/ta <account_name> <modifier> -- Add or substract time from the\n");
-			ShowMessage("   example: ta apple +1m-2mn1s-2y        validity limit of an account\n");
-			ShowMessage(" timeset/ts <account_name> yyyy/mm/dd [hh:mm:ss] -- Change the validify limit\n");
-			ShowMessage(" timeset/ts <account_name> 0          -- Give a unlimited validity limit\n");
-			ShowMessage(" unban/unbanish <account name>        -- Remove the banishment of an account\n");
-			ShowMessage(" unblock <account name>               -- Set state 0 (Account ok) to an account\n");
-			ShowMessage(" version                              -- Gives the version of the login-server\n");
-			ShowMessage(" who <account name>                   -- Display all information of an account\n");
-			ShowMessage(" who <account name>                   -- Display all information of an account\n");
-			ShowMessage(" Note: To use spaces in an account name, type \"<account name>\" (or ').\n");
-		}
+		ShowMessage(" sex <nomcompte> <sexe>               -- Modify the sex of an account\n");
+		ShowMessage(" state <account_name> <new_state> <error_message_#7> -- Change the state\n");
+		ShowMessage(" timeadd/ta <account_name> <modifier> -- Add or substract time from the\n");
+		ShowMessage("   example: ta apple +1m-2mn1s-2y        validity limit of an account\n");
+		ShowMessage(" timeset/ts <account_name> yyyy/mm/dd [hh:mm:ss] -- Change the validify limit\n");
+		ShowMessage(" timeset/ts <account_name> 0          -- Give a unlimited validity limit\n");
+		ShowMessage(" unban/unbanish <account name>        -- Remove the banishment of an account\n");
+		ShowMessage(" unblock <account name>               -- Set state 0 (Account ok) to an account\n");
+		ShowMessage(" version                              -- Gives the version of the login-server\n");
+		ShowMessage(" who <account name>                   -- Display all information of an account\n");
+		ShowMessage(" who <account name>                   -- Display all information of an account\n");
+		ShowMessage(" Note: To use spaces in an account name, type \"<account name>\" (or ').\n");
 	}
 }
 
@@ -1109,15 +758,9 @@ int addaccount(char* param, int emailflag)
 		if (sscanf(param, "\"%[^\"]\" %s %[^\r\n]", name, sex, password) < 2 && // password can be void
 		    sscanf(param, "'%[^']' %s %[^\r\n]", name, sex, password) < 2 && // password can be void
 		    sscanf(param, "%s %s %[^\r\n]", name, sex, password) < 2) { // password can be void
-			if (defaultlanguage == 'F') {
-				ShowMessage("Entrez un nom de compte, un sexe et un mot de passe svp.\n");
-				ShowMessage("<exemple> add nomtest Male motdepassetest\n");
-				ladmin_log("Nombre incorrect de param鑼res pour cr馥r un compte (commande 'add').\n");
-			} else {
-				ShowMessage("Please input an account name, a sex and a password.\n");
-				ShowMessage("<example> add testname Male testpass\n");
-				ladmin_log("Incomplete parameters to create an account ('add' command).\n");
-			}
+			ShowMessage("Please input an account name, a sex and a password.\n");
+			ShowMessage("<example> add testname Male testpass\n");
+			ladmin_log("Incomplete parameters to create an account ('add' command).\n");
 			return 136;
 		}
 		strcpy(email, "a@a.com"); // default email
@@ -1125,15 +768,9 @@ int addaccount(char* param, int emailflag)
 		if (sscanf(param, "\"%[^\"]\" %s %s %[^\r\n]", name, sex, email, password) < 3 && // password can be void
 		    sscanf(param, "'%[^']' %s %s %[^\r\n]", name, sex, email, password) < 3 && // password can be void
 		    sscanf(param, "%s %s %s %[^\r\n]", name, sex, email, password) < 3) { // password can be void
-			if (defaultlanguage == 'F') {
-				ShowMessage("Entrez un nom de compte, un sexe et un mot de passe svp.\n");
-				ShowMessage("<exemple> create nomtest Male mo@mail.com motdepassetest\n");
-				ladmin_log("Nombre incorrect de param鑼res pour cr馥r un compte (commande 'create').\n");
-			} else {
-				ShowMessage("Please input an account name, a sex and a password.\n");
-				ShowMessage("<example> create testname Male my@mail.com testpass\n");
-				ladmin_log("Incomplete parameters to create an account ('create' command).\n");
-			}
+			ShowMessage("Please input an account name, a sex and a password.\n");
+			ShowMessage("<example> create testname Male my@mail.com testpass\n");
+			ladmin_log("Incomplete parameters to create an account ('create' command).\n");
 			return 136;
 		}
 	}
@@ -1143,44 +780,24 @@ int addaccount(char* param, int emailflag)
 
 	sex[0] = TOUPPER(sex[0]);
 	if (strchr("MF", sex[0]) == NULL) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Sexe incorrect [%s]. Entrez M ou F svp.\n", sex);
-			ladmin_log("Sexe incorrect [%s]. Entrez M ou F svp.\n", sex);
-		} else {
-			ShowMessage("Illegal gender [%s]. Please input M or F.\n", sex);
-			ladmin_log("Illegal gender [%s]. Please input M or F.\n", sex);
-		}
+		ShowMessage("Illegal gender [%s]. Please input M or F.\n", sex);
+		ladmin_log("Illegal gender [%s]. Please input M or F.\n", sex);
 		return 103;
 	}
 
 	if (strlen(email) < 3) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Email trop courte [%s]. Entrez une e-mail valide svp.\n", email);
-			ladmin_log("Email trop courte [%s]. Entrez une e-mail valide svp.\n", email);
-		} else {
-			ShowMessage("Email is too short [%s]. Please input a valid e-mail.\n", email);
-			ladmin_log("Email is too short [%s]. Please input a valid e-mail.\n", email);
-		}
+		ShowMessage("Email is too short [%s]. Please input a valid e-mail.\n", email);
+		ladmin_log("Email is too short [%s]. Please input a valid e-mail.\n", email);
 		return 109;
 	}
 	if (strlen(email) > 39) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Email trop longue [%s]. Entrez une e-mail de 39 caract鑽es maximum svp.\n", email);
-			ladmin_log("Email trop longue [%s]. Entrez une e-mail de 39 caract鑽es maximum svp.\n", email);
-		} else {
-			ShowMessage("Email is too long [%s]. Please input an e-mail with 39 bytes at the most.\n", email);
-			ladmin_log("Email is too long [%s]. Please input an e-mail with 39 bytes at the most.\n", email);
-		}
+		ShowMessage("Email is too long [%s]. Please input an e-mail with 39 bytes at the most.\n", email);
+		ladmin_log("Email is too long [%s]. Please input an e-mail with 39 bytes at the most.\n", email);
 		return 109;
 	}
 	if (e_mail_check(email) == 0) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Email incorrecte [%s]. Entrez une e-mail valide svp.\n", email);
-			ladmin_log("Email incorrecte [%s]. Entrez une e-mail valide svp.\n", email);
-		} else {
-			ShowMessage("Invalid email [%s]. Please input a valid e-mail.\n", email);
-			ladmin_log("Invalid email [%s]. Please input a valid e-mail.\n", email);
-		}
+		ShowMessage("Invalid email [%s]. Please input a valid e-mail.\n", email);
+		ladmin_log("Invalid email [%s]. Please input a valid e-mail.\n", email);
 		return 109;
 	}
 
@@ -1191,11 +808,7 @@ int addaccount(char* param, int emailflag)
 	if (verify_password(password) == 0)
 		return 104;
 
-	if (defaultlanguage == 'F') {
-		ladmin_log("Envoi d'un requ黎e au serveur de logins pour cr馥r un compte.\n");
-	} else {
-		ladmin_log("Request to login-server to create an account.\n");
-	}
+	ladmin_log("Request to login-server to create an account.\n");
 
 	WFIFOW(login_fd,0) = 0x7930;
 	memcpy(WFIFOP(login_fd,2), name, 24);
@@ -1226,19 +839,11 @@ int banaddaccount(char* param)
 	if (sscanf(param, "\"%[^\"]\" %[^\r\n]", name, modif) < 2 &&
 	    sscanf(param, "'%[^']' %[^\r\n]", name, modif) < 2 &&
 	    sscanf(param, "%s %[^\r\n]", name, modif) < 2) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un nom de compte et un modificateur svp.\n");
-			ShowMessage("  <exemple> banadd nomtest +1m-2mn1s-6y\n");
-			ShowMessage("            Cette exemple ajoute 1 mois et 1 seconde, et soustrait 2 minutes\n");
-			ShowMessage("            et 6 ans dans le m麥e temps.\n");
-			ladmin_log("Nombre incorrect de param鑼res pour modifier la fin de ban d'un compte (commande 'banadd').\n");
-		} else {
-			ShowMessage("Please input an account name and a modifier.\n");
-			ShowMessage("  <example>: banadd testname +1m-2mn1s-6y\n");
-			ShowMessage("             this example adds 1 month and 1 second, and substracts 2 minutes\n");
-			ShowMessage("             and 6 years at the same time.\n");
-			ladmin_log("Incomplete parameters to modify the ban date/time of an account ('banadd' command).\n");
-		}
+		ShowMessage("Please input an account name and a modifier.\n");
+		ShowMessage("  <example>: banadd testname +1m-2mn1s-6y\n");
+		ShowMessage("             this example adds 1 month and 1 second, and substracts 2 minutes\n");
+		ShowMessage("             and 6 years at the same time.\n");
+		ladmin_log("Incomplete parameters to modify the ban date/time of an account ('banadd' command).\n");
 		return 136;
 	}
 	if (verify_accountname(name) == 0) {
@@ -1283,120 +888,61 @@ int banaddaccount(char* param)
 		}
 	}
 
-	if (defaultlanguage == 'F') {
-		ShowMessage(" ann馥:   %d\n", year);
-		ShowMessage(" mois:    %d\n", month);
-		ShowMessage(" jour:    %d\n", day);
-		ShowMessage(" heure:   %d\n", hour);
-		ShowMessage(" minute:  %d\n", minute);
-		ShowMessage(" seconde: %d\n", second);
-	} else {
-		ShowMessage(" year:   %d\n", year);
-		ShowMessage(" month:  %d\n", month);
-		ShowMessage(" day:    %d\n", day);
-		ShowMessage(" hour:   %d\n", hour);
-		ShowMessage(" minute: %d\n", minute);
-		ShowMessage(" second: %d\n", second);
-	}
+	ShowMessage(" year:   %d\n", year);
+	ShowMessage(" month:  %d\n", month);
+	ShowMessage(" day:    %d\n", day);
+	ShowMessage(" hour:   %d\n", hour);
+	ShowMessage(" minute: %d\n", minute);
+	ShowMessage(" second: %d\n", second);
 
 	if (year == 0 && month == 0 && day == 0 && hour == 0 && minute == 0 && second == 0) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Vous devez entrer un ajustement avec cette commande, svp:\n");
-			ShowMessage("  Valeur d'ajustement (-1, 1, +1, etc...)\n");
-			ShowMessage("  Element modifi�:\n");
-			ShowMessage("    a ou y: ann馥\n");
-			ShowMessage("    m:      mois\n");
-			ShowMessage("    j ou d: jour\n");
-			ShowMessage("    h:      heure\n");
-			ShowMessage("    mn:     minute\n");
-			ShowMessage("    s:      seconde\n");
-			ShowMessage("  <exemple> banadd nomtest +1m-2mn1s-6y\n");
-			ShowMessage("            Cette exemple ajoute 1 mois et 1 seconde, et soustrait 2 minutes\n");
-			ShowMessage("            et 6 ans dans le m麥e temps.\n");
-			ladmin_log("Aucun ajustement n'est pas un ajustement (commande 'banadd').\n");
-		} else {
-			ShowMessage("Please give an adjustment with this command:\n");
-			ShowMessage("  Adjustment value (-1, 1, +1, etc...)\n");
-			ShowMessage("  Modified element:\n");
-			ShowMessage("    a or y: year\n");
-			ShowMessage("    m: month\n");
-			ShowMessage("    j or d: day\n");
-			ShowMessage("    h: hour\n");
-			ShowMessage("    mn: minute\n");
-			ShowMessage("    s: second\n");
-			ShowMessage("  <example> banadd testname +1m-2mn1s-6y\n");
-			ShowMessage("            this example adds 1 month and 1 second, and substracts 2 minutes\n");
-			ShowMessage("            and 6 years at the same time.\n");
-			ladmin_log("No adjustment isn't an adjustment ('banadd' command).\n");
-		}
+		ShowMessage("Please give an adjustment with this command:\n");
+		ShowMessage("  Adjustment value (-1, 1, +1, etc...)\n");
+		ShowMessage("  Modified element:\n");
+		ShowMessage("    a or y: year\n");
+		ShowMessage("    m: month\n");
+		ShowMessage("    j or d: day\n");
+		ShowMessage("    h: hour\n");
+		ShowMessage("    mn: minute\n");
+		ShowMessage("    s: second\n");
+		ShowMessage("  <example> banadd testname +1m-2mn1s-6y\n");
+		ShowMessage("            this example adds 1 month and 1 second, and substracts 2 minutes\n");
+		ShowMessage("            and 6 years at the same time.\n");
+		ladmin_log("No adjustment isn't an adjustment ('banadd' command).\n");
 		return 137;
 	}
 	if (year > 127 || year < -127) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un ajustement d'ann馥s correct (de -127 � 127), svp.\n");
-			ladmin_log("Ajustement de l'ann馥 hors norme (commande 'banadd').\n");
-		} else {
-			ShowMessage("Please give a correct adjustment for the years (from -127 to 127).\n");
-			ladmin_log("Abnormal adjustment for the year ('banadd' command).\n");
-		}
+		ShowMessage("Please give a correct adjustment for the years (from -127 to 127).\n");
+		ladmin_log("Abnormal adjustment for the year ('banadd' command).\n");
 		return 137;
 	}
 	if (month > 255 || month < -255) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un ajustement de mois correct (de -255 � 255), svp.\n");
-			ladmin_log("Ajustement du mois hors norme (commande 'banadd').\n");
-		} else {
-			ShowMessage("Please give a correct adjustment for the months (from -255 to 255).\n");
-			ladmin_log("Abnormal adjustment for the month ('banadd' command).\n");
-		}
+		ShowMessage("Please give a correct adjustment for the months (from -255 to 255).\n");
+		ladmin_log("Abnormal adjustment for the month ('banadd' command).\n");
 		return 137;
 	}
 	if (day > 32767 || day < -32767) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un ajustement de jours correct (de -32767 � 32767), svp.\n");
-			ladmin_log("Ajustement des jours hors norme (commande 'banadd').\n");
-		} else {
-			ShowMessage("Please give a correct adjustment for the days (from -32767 to 32767).\n");
-			ladmin_log("Abnormal adjustment for the days ('banadd' command).\n");
-		}
+		ShowMessage("Please give a correct adjustment for the days (from -32767 to 32767).\n");
+		ladmin_log("Abnormal adjustment for the days ('banadd' command).\n");
 		return 137;
 	}
 	if (hour > 32767 || hour < -32767) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un ajustement d'heures correct (de -32767 � 32767), svp.\n");
-			ladmin_log("Ajustement des heures hors norme (commande 'banadd').\n");
-		} else {
-			ShowMessage("Please give a correct adjustment for the hours (from -32767 to 32767).\n");
-			ladmin_log("Abnormal adjustment for the hours ('banadd' command).\n");
-		}
+		ShowMessage("Please give a correct adjustment for the hours (from -32767 to 32767).\n");
+		ladmin_log("Abnormal adjustment for the hours ('banadd' command).\n");
 		return 137;
 	}
 	if (minute > 32767 || minute < -32767) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un ajustement de minutes correct (de -32767 � 32767), svp.\n");
-			ladmin_log("Ajustement des minutes hors norme (commande 'banadd').\n");
-		} else {
-			ShowMessage("Please give a correct adjustment for the minutes (from -32767 to 32767).\n");
-			ladmin_log("Abnormal adjustment for the minutes ('banadd' command).\n");
-		}
+		ShowMessage("Please give a correct adjustment for the minutes (from -32767 to 32767).\n");
+		ladmin_log("Abnormal adjustment for the minutes ('banadd' command).\n");
 		return 137;
 	}
 	if (second > 32767 || second < -32767) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un ajustement de secondes correct (de -32767 � 32767), svp.\n");
-			ladmin_log("Ajustement des secondes hors norme (commande 'banadd').\n");
-		} else {
-			ShowMessage("Please give a correct adjustment for the seconds (from -32767 to 32767).\n");
-			ladmin_log("Abnormal adjustment for the seconds ('banadd' command).\n");
-		}
+		ShowMessage("Please give a correct adjustment for the seconds (from -32767 to 32767).\n");
+		ladmin_log("Abnormal adjustment for the seconds ('banadd' command).\n");
 		return 137;
 	}
 
-	if (defaultlanguage == 'F') {
-		ladmin_log("Envoi d'un requ黎e au serveur de logins pour modifier la date d'un bannissement.\n");
-	} else {
-		ladmin_log("Request to login-server to modify a ban date/time.\n");
-	}
+	ladmin_log("Request to login-server to modify a ban date/time.\n");
 
 	WFIFOW(login_fd,0) = 0x794c;
 	memcpy(WFIFOP(login_fd,2), name, 24);
@@ -1435,16 +981,11 @@ int bansetaccountsub(char* name, char* date, char* time)
 	    ((sscanf(date, "%d/%d/%d", &year, &month, &day) < 3 &&
 	      sscanf(date, "%d-%d-%d", &year, &month, &day) < 3 &&
 	      sscanf(date, "%d.%d.%d", &year, &month, &day) < 3) ||
-	     sscanf(time, "%d:%d:%d", &hour, &minute, &second) < 3)) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez une date et une heure svp (format: aaaa/mm/jj hh:mm:ss).\n");
-			ShowMessage("Vous pouvez aussi mettre 0 � la place si vous utilisez la commande 'banset'.\n");
-			ladmin_log("Format incorrect pour la date/heure (commande'banset' ou 'ban').\n");
-		} else {
-			ShowMessage("Please input a date and a time (format: yyyy/mm/dd hh:mm:ss).\n");
-			ShowMessage("You can imput 0 instead of if you use 'banset' command.\n");
-			ladmin_log("Invalid format for the date/time ('banset' or 'ban' command).\n");
-		}
+	     sscanf(time, "%d:%d:%d", &hour, &minute, &second) < 3))
+	{
+		ShowMessage("Please input a date and a time (format: yyyy/mm/dd hh:mm:ss).\n");
+		ShowMessage("You can imput 0 instead of if you use 'banset' command.\n");
+		ladmin_log("Invalid format for the date/time ('banset' or 'ban' command).\n");
 		return 102;
 	}
 
@@ -1458,65 +999,35 @@ int bansetaccountsub(char* name, char* date, char* time)
 			year = year - 1900;
 		}
 		if (month < 1 || month > 12) {
-			if (defaultlanguage == 'F') {
-				ShowMessage("Entrez un mois correct svp (entre 1 et 12).\n");
-				ladmin_log("Mois incorrect pour la date (command 'banset' ou 'ban').\n");
-			} else {
-				ShowMessage("Please give a correct value for the month (from 1 to 12).\n");
-				ladmin_log("Invalid month for the date ('banset' or 'ban' command).\n");
-			}
+			ShowMessage("Please give a correct value for the month (from 1 to 12).\n");
+			ladmin_log("Invalid month for the date ('banset' or 'ban' command).\n");
 			return 102;
 		}
 		month = month - 1;
 		if (day < 1 || day > 31) {
-			if (defaultlanguage == 'F') {
-				ShowMessage("Entrez un jour correct svp (entre 1 et 31).\n");
-				ladmin_log("Jour incorrect pour la date (command 'banset' ou 'ban').\n");
-			} else {
-				ShowMessage("Please give a correct value for the day (from 1 to 31).\n");
-				ladmin_log("Invalid day for the date ('banset' or 'ban' command).\n");
-			}
+			ShowMessage("Please give a correct value for the day (from 1 to 31).\n");
+			ladmin_log("Invalid day for the date ('banset' or 'ban' command).\n");
 			return 102;
 		}
 		if (((month == 3 || month == 5 || month == 8 || month == 10) && day > 30) ||
 		    (month == 1 && day > 29)) {
-			if (defaultlanguage == 'F') {
-				ShowMessage("Entrez un jour correct en fonction du mois (%d) svp.\n", month);
-				ladmin_log("Jour incorrect pour ce mois correspondant (command 'banset' ou 'ban').\n");
-			} else {
-				ShowMessage("Please give a correct value for a day of this month (%d).\n", month);
-				ladmin_log("Invalid day for this month ('banset' or 'ban' command).\n");
-			}
+			ShowMessage("Please give a correct value for a day of this month (%d).\n", month);
+			ladmin_log("Invalid day for this month ('banset' or 'ban' command).\n");
 			return 102;
 		}
 		if (hour < 0 || hour > 23) {
-			if (defaultlanguage == 'F') {
-				ShowMessage("Entrez une heure correcte svp (entre 0 et 23).\n");
-				ladmin_log("Heure incorrecte pour l'heure (command 'banset' ou 'ban').\n");
-			} else {
-				ShowMessage("Please give a correct value for the hour (from 0 to 23).\n");
-				ladmin_log("Invalid hour for the time ('banset' or 'ban' command).\n");
-			}
+			ShowMessage("Please give a correct value for the hour (from 0 to 23).\n");
+			ladmin_log("Invalid hour for the time ('banset' or 'ban' command).\n");
 			return 102;
 		}
 		if (minute < 0 || minute > 59) {
-			if (defaultlanguage == 'F') {
-				ShowMessage("Entrez des minutes correctes svp (entre 0 et 59).\n");
-				ladmin_log("Minute incorrecte pour l'heure (command 'banset' ou 'ban').\n");
-			} else {
-				ShowMessage("Please give a correct value for the minutes (from 0 to 59).\n");
-				ladmin_log("Invalid minute for the time ('banset' or 'ban' command).\n");
-			}
+			ShowMessage("Please give a correct value for the minutes (from 0 to 59).\n");
+			ladmin_log("Invalid minute for the time ('banset' or 'ban' command).\n");
 			return 102;
 		}
 		if (second < 0 || second > 59) {
-			if (defaultlanguage == 'F') {
-				ShowMessage("Entrez des secondes correctes svp (entre 0 et 59).\n");
-				ladmin_log("Seconde incorrecte pour l'heure (command 'banset' ou 'ban').\n");
-			} else {
-				ShowMessage("Please give a correct value for the seconds (from 0 to 59).\n");
-				ladmin_log("Invalid second for the time ('banset' or 'ban' command).\n");
-			}
+			ShowMessage("Please give a correct value for the seconds (from 0 to 59).\n");
+			ladmin_log("Invalid second for the time ('banset' or 'ban' command).\n");
 			return 102;
 		}
 		tmtime->tm_year = year;
@@ -1528,26 +1039,15 @@ int bansetaccountsub(char* name, char* date, char* time)
 		tmtime->tm_isdst = -1; // -1: no winter/summer time modification
 		unban_time = mktime(tmtime);
 		if (unban_time == -1) {
-			if (defaultlanguage == 'F') {
-				ShowMessage("Date incorrecte.\n");
-				ShowMessage("Entrez une date et une heure svp (format: aaaa/mm/jj hh:mm:ss).\n");
-				ShowMessage("Vous pouvez aussi mettre 0 � la place si vous utilisez la commande 'banset'.\n");
-				ladmin_log("Date incorrecte. (command 'banset' ou 'ban').\n");
-			} else {
-				ShowMessage("Invalid date.\n");
-				ShowMessage("Please input a date and a time (format: yyyy/mm/dd hh:mm:ss).\n");
-				ShowMessage("You can imput 0 instead of if you use 'banset' command.\n");
-				ladmin_log("Invalid date. ('banset' or 'ban' command).\n");
-			}
+			ShowMessage("Invalid date.\n");
+			ShowMessage("Please input a date and a time (format: yyyy/mm/dd hh:mm:ss).\n");
+			ShowMessage("You can imput 0 instead of if you use 'banset' command.\n");
+			ladmin_log("Invalid date. ('banset' or 'ban' command).\n");
 			return 102;
 		}
 	}
 
-	if (defaultlanguage == 'F') {
-		ladmin_log("Envoi d'un requ黎e au serveur de logins pour fixer un ban.\n");
-	} else {
-		ladmin_log("Request to login-server to set a ban.\n");
-	}
+	ladmin_log("Request to login-server to set a ban.\n");
 
 	WFIFOW(login_fd,0) = 0x794a;
 	memcpy(WFIFOP(login_fd,2), name, 24);
@@ -1572,23 +1072,13 @@ int banaccount(char* param)
 	if (sscanf(param, "%s %s \"%[^\"]\"", date, time, name) < 3 &&
 	    sscanf(param, "%s %s '%[^']'", date, time, name) < 3 &&
 	    sscanf(param, "%s %s %[^\r\n]", date, time, name) < 3) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un nom de compte, une date et une heure svp.\n");
-			ShowMessage("<exemple>: banset <nom_du_compte> aaaa/mm/jj [hh:mm:ss]\n");
-			ShowMessage("           banset <nom_du_compte> 0    (0 = d�-bani)\n");
-			ShowMessage("           ban/banish aaaa/mm/jj hh:mm:ss <nom du compte>\n");
-			ShowMessage("           unban/unbanish <nom du compte>\n");
-			ShowMessage("           Heure par d馭aut [hh:mm:ss]: 23:59:59.\n");
-			ladmin_log("Nombre incorrect de param鑼res pour fixer un ban (commande 'banset' ou 'ban').\n");
-		} else {
-			ShowMessage("Please input an account name, a date and a hour.\n");
-			ShowMessage("<example>: banset <account_name> yyyy/mm/dd [hh:mm:ss]\n");
-			ShowMessage("           banset <account_name> 0   (0 = un-banished)\n");
-			ShowMessage("           ban/banish yyyy/mm/dd hh:mm:ss <account name>\n");
-			ShowMessage("           unban/unbanish <account name>\n");
-			ShowMessage("           Default time [hh:mm:ss]: 23:59:59.\n");
-			ladmin_log("Incomplete parameters to set a ban ('banset' or 'ban' command).\n");
-		}
+		ShowMessage("Please input an account name, a date and a hour.\n");
+		ShowMessage("<example>: banset <account_name> yyyy/mm/dd [hh:mm:ss]\n");
+		ShowMessage("           banset <account_name> 0   (0 = un-banished)\n");
+		ShowMessage("           ban/banish yyyy/mm/dd hh:mm:ss <account name>\n");
+		ShowMessage("           unban/unbanish <account name>\n");
+		ShowMessage("           Default time [hh:mm:ss]: 23:59:59.\n");
+		ladmin_log("Incomplete parameters to set a ban ('banset' or 'ban' command).\n");
 		return 136;
 	}
 
@@ -1609,23 +1099,13 @@ int bansetaccount(char* param)
 	if (sscanf(param, "\"%[^\"]\" %s %[^\r\n]", name, date, time) < 2 && // if date = 0, time can be void
 	    sscanf(param, "'%[^']' %s %[^\r\n]", name, date, time) < 2 && // if date = 0, time can be void
 	    sscanf(param, "%s %s %[^\r\n]", name, date, time) < 2) { // if date = 0, time can be void
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un nom de compte, une date et une heure svp.\n");
-			ShowMessage("<exemple>: banset <nom_du_compte> aaaa/mm/jj [hh:mm:ss]\n");
-			ShowMessage("           banset <nom_du_compte> 0    (0 = d�-bani)\n");
-			ShowMessage("           ban/banish aaaa/mm/jj hh:mm:ss <nom du compte>\n");
-			ShowMessage("           unban/unbanish <nom du compte>\n");
-			ShowMessage("           Heure par d馭aut [hh:mm:ss]: 23:59:59.\n");
-			ladmin_log("Nombre incorrect de param鑼res pour fixer un ban (commande 'banset' ou 'ban').\n");
-		} else {
-			ShowMessage("Please input an account name, a date and a hour.\n");
-			ShowMessage("<example>: banset <account_name> yyyy/mm/dd [hh:mm:ss]\n");
-			ShowMessage("           banset <account_name> 0   (0 = un-banished)\n");
-			ShowMessage("           ban/banish yyyy/mm/dd hh:mm:ss <account name>\n");
-			ShowMessage("           unban/unbanish <account name>\n");
-			ShowMessage("           Default time [hh:mm:ss]: 23:59:59.\n");
-			ladmin_log("Incomplete parameters to set a ban ('banset' or 'ban' command).\n");
-		}
+		ShowMessage("Please input an account name, a date and a hour.\n");
+		ShowMessage("<example>: banset <account_name> yyyy/mm/dd [hh:mm:ss]\n");
+		ShowMessage("           banset <account_name> 0   (0 = un-banished)\n");
+		ShowMessage("           ban/banish yyyy/mm/dd hh:mm:ss <account name>\n");
+		ShowMessage("           unban/unbanish <account name>\n");
+		ShowMessage("           Default time [hh:mm:ss]: 23:59:59.\n");
+		ladmin_log("Incomplete parameters to set a ban ('banset' or 'ban' command).\n");
 		return 136;
 	}
 
@@ -1648,24 +1128,15 @@ int unbanaccount(char* param)
 	    (sscanf(param, "\"%[^\"]\"", name) < 1 &&
 	     sscanf(param, "'%[^']'", name) < 1 &&
 	     sscanf(param, "%[^\r\n]", name) < 1) ||
-	     strlen(name) == 0) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un nom de compte svp.\n");
-			ShowMessage("<exemple>: banset <nom_du_compte> aaaa/mm/jj [hh:mm:ss]\n");
-			ShowMessage("           banset <nom_du_compte> 0    (0 = d�-bani)\n");
-			ShowMessage("           ban/banish aaaa/mm/jj hh:mm:ss <nom du compte>\n");
-			ShowMessage("           unban/unbanish <nom du compte>\n");
-			ShowMessage("           Heure par d馭aut [hh:mm:ss]: 23:59:59.\n");
-			ladmin_log("Nombre incorrect de param鑼res pour fixer un ban (commande 'unban').\n");
-		} else {
-			ShowMessage("Please input an account name.\n");
-			ShowMessage("<example>: banset <account_name> yyyy/mm/dd [hh:mm:ss]\n");
-			ShowMessage("           banset <account_name> 0   (0 = un-banished)\n");
-			ShowMessage("           ban/banish yyyy/mm/dd hh:mm:ss <account name>\n");
-			ShowMessage("           unban/unbanish <account name>\n");
-			ShowMessage("           Default time [hh:mm:ss]: 23:59:59.\n");
-			ladmin_log("Incomplete parameters to set a ban ('unban' command).\n");
-		}
+	     strlen(name) == 0)
+	{
+		ShowMessage("Please input an account name.\n");
+		ShowMessage("<example>: banset <account_name> yyyy/mm/dd [hh:mm:ss]\n");
+		ShowMessage("           banset <account_name> 0   (0 = un-banished)\n");
+		ShowMessage("           ban/banish yyyy/mm/dd hh:mm:ss <account name>\n");
+		ShowMessage("           unban/unbanish <account name>\n");
+		ShowMessage("           Default time [hh:mm:ss]: 23:59:59.\n");
+		ladmin_log("Incomplete parameters to set a ban ('unban' command).\n");
 		return 136;
 	}
 
@@ -1687,15 +1158,9 @@ int checkaccount(char* param)
 	if (sscanf(param, "\"%[^\"]\" %[^\r\n]", name, password) < 1 && // password can be void
 	    sscanf(param, "'%[^']' %[^\r\n]", name, password) < 1 && // password can be void
 	    sscanf(param, "%s %[^\r\n]", name, password) < 1) { // password can be void
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un nom de compte svp.\n");
-			ShowMessage("<exemple> check testname motdepasse\n");
-			ladmin_log("Nombre incorrect de param鑼res pour tester le mot d'un passe d'un compte (commande 'check').\n");
-		} else {
-			ShowMessage("Please input an account name.\n");
-			ShowMessage("<example> check testname password\n");
-			ladmin_log("Incomplete parameters to check the password of an account ('check' command).\n");
-		}
+		ShowMessage("Please input an account name.\n");
+		ShowMessage("<example> check testname password\n");
+		ladmin_log("Incomplete parameters to check the password of an account ('check' command).\n");
 		return 136;
 	}
 
@@ -1710,11 +1175,7 @@ int checkaccount(char* param)
 	if (verify_password(password) == 0)
 		return 131;
 
-	if (defaultlanguage == 'F') {
-		ladmin_log("Envoi d'un requ黎e au serveur de logins pour test un mot de passe.\n");
-	} else {
-		ladmin_log("Request to login-server to check a password.\n");
-	}
+	ladmin_log("Request to login-server to check a password.\n");
 
 	WFIFOW(login_fd,0) = 0x793a;
 	memcpy(WFIFOP(login_fd,2), name, 24);
@@ -1742,16 +1203,11 @@ int delaccount(char* param)
 	    (sscanf(param, "\"%[^\"]\"", name) < 1 &&
 	     sscanf(param, "'%[^']'", name) < 1 &&
 	     sscanf(param, "%[^\r\n]", name) < 1) ||
-	     strlen(name) == 0) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un nom de compte svp.\n");
-			ShowMessage("<exemple> del nomtestasupprimer\n");
-			ladmin_log("Aucun nom donn� pour supprimer un compte (commande 'delete').\n");
-		} else {
-			ShowMessage("Please input an account name.\n");
-			ShowMessage("<example> del testnametodelete\n");
-			ladmin_log("No name given to delete an account ('delete' command).\n");
-		}
+	     strlen(name) == 0)
+	{
+		ShowMessage("Please input an account name.\n");
+		ShowMessage("<example> del testnametodelete\n");
+		ladmin_log("No name given to delete an account ('delete' command).\n");
 		return 136;
 	}
 
@@ -1760,11 +1216,9 @@ int delaccount(char* param)
 	}
 
 	memset(confirm, '\0', sizeof(confirm));
-	while ((confirm[0] != 'o' || defaultlanguage != 'F') && confirm[0] != 'n' && (confirm[0] != 'y' || defaultlanguage == 'F')) {
-		if (defaultlanguage == 'F')
-			ShowMessage("\033[1;36m ** Etes-vous vraiment s�r de vouloir SUPPRIMER le compte [$userid]? (o/n) > \033[0m");
-		else
-			ShowMessage("\033[1;36m ** Are you really sure to DELETE account [$userid]? (y/n) > \033[0m");
+	while (confirm[0] != 'n' && confirm[0] != 'y')
+	{
+		ShowMessage("\033[1;36m ** Are you really sure to DELETE account [$userid]? (y/n) > \033[0m");
 		fflush(stdout);
 		memset(confirm, '\0', sizeof(confirm));
 		i = 0;
@@ -1773,21 +1227,12 @@ int delaccount(char* param)
 	}
 
 	if (confirm[0] == 'n') {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Suppression annul馥.\n");
-			ladmin_log("Suppression annul馥 par l'utilisateur (commande 'delete').\n");
-		} else {
-			ShowMessage("Deletion canceled.\n");
-			ladmin_log("Deletion canceled by user ('delete' command).\n");
-		}
+		ShowMessage("Deletion canceled.\n");
+		ladmin_log("Deletion canceled by user ('delete' command).\n");
 		return 121;
 	}
 
-	if (defaultlanguage == 'F') {
-		ladmin_log("Envoi d'un requ黎e au serveur de logins pour d騁ruire un compte.\n");
-	} else {
-		ladmin_log("Request to login-server to delete an acount.\n");
-	}
+	ladmin_log("Request to login-server to delete an acount.\n");
 
 	WFIFOW(login_fd,0) = 0x7932;
 	memcpy(WFIFOP(login_fd,2), name, 24);
@@ -1811,15 +1256,9 @@ int changeemail(char* param)
 	if (sscanf(param, "\"%[^\"]\" %[^\r\n]", name, email) < 2 &&
 	    sscanf(param, "'%[^']' %[^\r\n]", name, email) < 2 &&
 	    sscanf(param, "%s %[^\r\n]", name, email) < 2) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un nom de compte et une email svp.\n");
-			ShowMessage("<exemple> email testname nouveauemail\n");
-			ladmin_log("Nombre incorrect de param鑼res pour changer l'email d'un compte (commande 'email').\n");
-		} else {
-			ShowMessage("Please input an account name and an email.\n");
-			ShowMessage("<example> email testname newemail\n");
-			ladmin_log("Incomplete parameters to change the email of an account ('email' command).\n");
-		}
+		ShowMessage("Please input an account name and an email.\n");
+		ShowMessage("<example> email testname newemail\n");
+		ladmin_log("Incomplete parameters to change the email of an account ('email' command).\n");
 		return 136;
 	}
 
@@ -1828,41 +1267,22 @@ int changeemail(char* param)
 	}
 
 	if (strlen(email) < 3) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Email trop courte [%s]. Entrez une e-mail valide svp.\n", email);
-			ladmin_log("Email trop courte [%s]. Entrez une e-mail valide svp.\n", email);
-		} else {
-			ShowMessage("Email is too short [%s]. Please input a valid e-mail.\n", email);
-			ladmin_log("Email is too short [%s]. Please input a valid e-mail.\n", email);
-		}
+		ShowMessage("Email is too short [%s]. Please input a valid e-mail.\n", email);
+		ladmin_log("Email is too short [%s]. Please input a valid e-mail.\n", email);
 		return 109;
 	}
 	if (strlen(email) > 39) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Email trop longue [%s]. Entrez une e-mail de 39 caract鑽es maximum svp.\n", email);
-			ladmin_log("Email trop longue [%s]. Entrez une e-mail de 39 caract鑽es maximum svp.\n", email);
-		} else {
-			ShowMessage("Email is too long [%s]. Please input an e-mail with 39 bytes at the most.\n", email);
-			ladmin_log("Email is too long [%s]. Please input an e-mail with 39 bytes at the most.\n", email);
-		}
+		ShowMessage("Email is too long [%s]. Please input an e-mail with 39 bytes at the most.\n", email);
+		ladmin_log("Email is too long [%s]. Please input an e-mail with 39 bytes at the most.\n", email);
 		return 109;
 	}
 	if (e_mail_check(email) == 0) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Email incorrecte [%s]. Entrez une e-mail valide svp.\n", email);
-			ladmin_log("Email incorrecte [%s]. Entrez une e-mail valide svp.\n", email);
-		} else {
-			ShowMessage("Invalid email [%s]. Please input a valid e-mail.\n", email);
-			ladmin_log("Invalid email [%s]. Please input a valid e-mail.\n", email);
-		}
+		ShowMessage("Invalid email [%s]. Please input a valid e-mail.\n", email);
+		ladmin_log("Invalid email [%s]. Please input a valid e-mail.\n", email);
 		return 109;
 	}
 
-	if (defaultlanguage == 'F') {
-		ladmin_log("Envoi d'un requ黎e au serveur de logins pour changer une email.\n");
-	} else {
-		ladmin_log("Request to login-server to change an email.\n");
-	}
+	ladmin_log("Request to login-server to change an email.\n");
 
 	WFIFOW(login_fd,0) = 0x7940;
 	memcpy(WFIFOP(login_fd,2), name, 24);
@@ -1879,11 +1299,7 @@ int changeemail(char* param)
 int getlogincount(void)
 {
 	WFIFOHEAD(login_fd,2);
-	if (defaultlanguage == 'F') {
-		ladmin_log("Envoi d'un requ黎e au serveur de logins pour obtenir le nombre de joueurs en jeu.\n");
-	} else {
-		ladmin_log("Request to login-server to obtain the # of online players.\n");
-	}
+	ladmin_log("Request to login-server to obtain the # of online players.\n");
 
 	WFIFOW(login_fd,0) = 0x7938;
 	WFIFOSET(login_fd,2);
@@ -1907,15 +1323,9 @@ int changegmlevel(char* param)
 	if (sscanf(param, "\"%[^\"]\" %d", name, &GM_level) < 1 &&
 	    sscanf(param, "'%[^']' %d", name, &GM_level) < 1 &&
 	    sscanf(param, "%s %d", name, &GM_level) < 1) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un nom de compte et un niveau de GM svp.\n");
-			ShowMessage("<exemple> gm nomtest 80\n");
-			ladmin_log("Nombre incorrect de param鑼res pour changer le Niveau de GM d'un compte (commande 'gm').\n");
-		} else {
-			ShowMessage("Please input an account name and a GM level.\n");
-			ShowMessage("<example> gm testname 80\n");
-			ladmin_log("Incomplete parameters to change the GM level of an account ('gm' command).\n");
-		}
+		ShowMessage("Please input an account name and a GM level.\n");
+		ShowMessage("<example> gm testname 80\n");
+		ladmin_log("Incomplete parameters to change the GM level of an account ('gm' command).\n");
 		return 136;
 	}
 
@@ -1924,21 +1334,12 @@ int changegmlevel(char* param)
 	}
 
 	if (GM_level < 0 || GM_level > 99) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Niveau de GM incorrect [%d]. Entrez une valeur de 0 � 99 svp.\n", GM_level);
-			ladmin_log("Niveau de GM incorrect [%d]. La valeur peut 黎re de 0 � 99.\n", GM_level);
-		} else {
-			ShowMessage("Illegal GM level [%d]. Please input a value from 0 to 99.\n", GM_level);
-			ladmin_log("Illegal GM level [%d]. The value can be from 0 to 99.\n", GM_level);
-		}
+		ShowMessage("Illegal GM level [%d]. Please input a value from 0 to 99.\n", GM_level);
+		ladmin_log("Illegal GM level [%d]. The value can be from 0 to 99.\n", GM_level);
 		return 103;
 	}
 
-	if (defaultlanguage == 'F') {
-		ladmin_log("Envoi d'un requ黎e au serveur de logins pour changer un niveau de GM.\n");
-	} else {
-		ladmin_log("Request to login-server to change a GM level.\n");
-	}
+	ladmin_log("Request to login-server to change a GM level.\n");
 
 	WFIFOW(login_fd,0) = 0x793e;
 	memcpy(WFIFOP(login_fd,2), name, 24);
@@ -1963,16 +1364,11 @@ int idaccount(char* param)
 	    (sscanf(param, "\"%[^\"]\"", name) < 1 &&
 	     sscanf(param, "'%[^']'", name) < 1 &&
 	     sscanf(param, "%[^\r\n]", name) < 1) ||
-	     strlen(name) == 0) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un nom de compte svp.\n");
-			ShowMessage("<exemple> id nomtest\n");
-			ladmin_log("Aucun nom donn� pour rechecher l'id d'un compte (commande 'id').\n");
-		} else {
-			ShowMessage("Please input an account name.\n");
-			ShowMessage("<example> id testname\n");
-			ladmin_log("No name given to search an account id ('id' command).\n");
-		}
+	     strlen(name) == 0)
+	{
+		ShowMessage("Please input an account name.\n");
+		ShowMessage("<example> id testname\n");
+		ladmin_log("No name given to search an account id ('id' command).\n");
 		return 136;
 	}
 
@@ -1980,11 +1376,7 @@ int idaccount(char* param)
 		return 102;
 	}
 
-	if (defaultlanguage == 'F') {
-		ladmin_log("Envoi d'un requ黎e au serveur de logins pour conna�tre l'id d'un compte.\n");
-	} else {
-		ladmin_log("Request to login-server to know an account id.\n");
-	}
+	ladmin_log("Request to login-server to know an account id.\n");
 
 	WFIFOW(login_fd,0) = 0x7944;
 	memcpy(WFIFOP(login_fd,2), name, 24);
@@ -2001,21 +1393,12 @@ int infoaccount(int account_id)
 {
 	WFIFOHEAD(login_fd,6);
 	if (account_id < 0) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un id ayant une valeur positive svp.\n");
-			ladmin_log("Une valeur n馮ative a 騁� donn� pour trouver le compte.\n");
-		} else {
-			ShowMessage("Please input a positive value for the id.\n");
-			ladmin_log("Negative value was given to found the account.\n");
-		}
+		ShowMessage("Please input a positive value for the id.\n");
+		ladmin_log("Negative value was given to found the account.\n");
 		return 136;
 	}
 
-	if (defaultlanguage == 'F') {
-		ladmin_log("Envoi d'un requ黎e au serveur de logins pour obtenir le information d'un compte (par l'id).\n");
-	} else {
-		ladmin_log("Request to login-server to obtain information about an account (by its id).\n");
-	}
+	ladmin_log("Request to login-server to obtain information about an account (by its id).\n");
 
 	WFIFOW(login_fd,0) = 0x7954;
 	WFIFOL(login_fd,2) = account_id;
@@ -2033,23 +1416,13 @@ int sendbroadcast(short type, char* message)
 	int len = strlen(message);
 	WFIFOHEAD(login_fd,9+len);
 	if (len == 0) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un message svp.\n");
-			if (type == 0) {
-				ShowMessage("<exemple> kami un message\n");
-			} else {
-				ShowMessage("<exemple> kamib un message\n");
-			}
-			ladmin_log("Le message est vide (commande 'kami(b)').\n");
+		ShowMessage("Please input a message.\n");
+		if (type == 0) {
+			ShowMessage("<example> kami a message\n");
 		} else {
-			ShowMessage("Please input a message.\n");
-			if (type == 0) {
-				ShowMessage("<example> kami a message\n");
-			} else {
-				ShowMessage("<example> kamib a message\n");
-			}
-			ladmin_log("The message is void ('kami(b)' command).\n");
+			ShowMessage("<example> kamib a message\n");
 		}
+		ladmin_log("The message is void ('kami(b)' command).\n");
 		return 136;
 	}
 	len++; //+'\0'
@@ -2063,49 +1436,6 @@ int sendbroadcast(short type, char* message)
 	return 0;
 }
 
-//--------------------------------------------
-// Sub-function: Change language of displaying
-//--------------------------------------------
-int changelanguage(char* language)
-{
-	if (strlen(language) == 0) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez une langue svp.\n");
-			ShowMessage("<exemple> language english\n");
-			ShowMessage("          language fran軋is\n");
-			ladmin_log("La langue est vide (commande 'language').\n");
-		} else {
-			ShowMessage("Please input a language.\n");
-			ShowMessage("<example> language english\n");
-			ShowMessage("          language fran軋is\n");
-			ladmin_log("The language is void ('language' command).\n");
-		}
-		return 136;
-	}
-
-	language[0] = TOUPPER(language[0]);
-	if (language[0] == 'F' || language[0] == 'E') {
-		defaultlanguage = language[0];
-		if (defaultlanguage == 'F') {
-			ShowMessage("Changement de la langue d'affichage en Fran軋is.\n");
-			ladmin_log("Changement de la langue d'affichage en Fran軋is.\n");
-		} else {
-			ShowMessage("Displaying language changed to English.\n");
-			ladmin_log("Displaying language changed to English.\n");
-		}
-	} else {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Langue non param騁r馥 (langues possibles: 'Fran軋is' ou 'English').\n");
-			ladmin_log("Langue non param騁r馥 (Fran軋is ou English n馗essaire).\n");
-		} else {
-			ShowMessage("Undefined language (possible languages: Fran軋is or English).\n");
-			ladmin_log("Undefined language (must be Fran軋is or English).\n");
-		}
-	}
-
-	return 0;
-}
-
 //--------------------------------------------------------
 // Sub-function: Asking to Displaying of the accounts list
 //--------------------------------------------------------
@@ -2148,11 +1478,7 @@ int listaccount(char* param, int type)
 		}
 	}
 
-	if (defaultlanguage == 'F') {
-		ladmin_log("Envoi d'un requ黎e au serveur de logins pour obtenir la liste des comptes de %d � %d.\n", list_first, list_last);
-	} else {
-		ladmin_log("Request to login-server to obtain the list of accounts from %d to %d.\n", list_first, list_last);
-	}
+	ladmin_log("Request to login-server to obtain the list of accounts from %d to %d.\n", list_first, list_last);
 
 	WFIFOW(login_fd,0) = 0x7920;
 	WFIFOL(login_fd,2) = list_first;
@@ -2161,11 +1487,7 @@ int listaccount(char* param, int type)
 	bytes_to_read = 1;
 
 	//          0123456789 01 01234567890123456789012301234 012345 0123456789012345678901234567
-	if (defaultlanguage == 'F') {
-		ShowMessage(" id_compte GM nom_utilisateur         sexe   count statut\n");
-	} else {
-		ShowMessage("account_id GM user_name               sex    count state\n");
-	}
+	ShowMessage("account_id GM user_name               sex    count state\n");
 	ShowMessage("-------------------------------------------------------------------------------\n");
 	list_count = 0;
 
@@ -2186,15 +1508,9 @@ int changememo(char* param)
 	if (sscanf(param, "\"%[^\"]\" %[^\r\n]", name, memo) < 1 && // memo can be void
 	    sscanf(param, "'%[^']' %[^\r\n]", name, memo) < 1 && // memo can be void
 	    sscanf(param, "%s %[^\r\n]", name, memo) < 1) { // memo can be void
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un nom de compte et un m駑o svp.\n");
-			ShowMessage("<exemple> memo nomtest nouveau memo\n");
-			ladmin_log("Nombre incorrect de param鑼res pour changer le m駑o d'un compte (commande 'email').\n");
-		} else {
-			ShowMessage("Please input an account name and a memo.\n");
-			ShowMessage("<example> memo testname new memo\n");
-			ladmin_log("Incomplete parameters to change the memo of an account ('email' command).\n");
-		}
+		ShowMessage("Please input an account name and a memo.\n");
+		ShowMessage("<example> memo testname new memo\n");
+		ladmin_log("Incomplete parameters to change the memo of an account ('email' command).\n");
 		return 136;
 	}
 
@@ -2203,23 +1519,13 @@ int changememo(char* param)
 	}
 
 	if (strlen(memo) > 254) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("M駑o trop long (%lu caract鑽es).\n", (unsigned long)strlen(memo));
-			ShowMessage("Entrez un m駑o de 254 caract鑽es maximum svp.\n");
-			ladmin_log("M駑o trop long (%d caract鑽es). Entrez un m駑o de 254 caract鑽es maximum svp.\n", strlen(memo));
-		} else {
-			ShowMessage("Memo is too long (%lu characters).\n", (unsigned long)strlen(memo));
-			ShowMessage("Please input a memo of 254 bytes at the maximum.\n");
-			ladmin_log("Email is too long (%d characters). Please input a memo of 254 bytes at the maximum.\n", strlen(memo));
-		}
+		ShowMessage("Memo is too long (%lu characters).\n", (unsigned long)strlen(memo));
+		ShowMessage("Please input a memo of 254 bytes at the maximum.\n");
+		ladmin_log("Email is too long (%d characters). Please input a memo of 254 bytes at the maximum.\n", strlen(memo));
 		return 102;
 	}
 
-	if (defaultlanguage == 'F') {
-		ladmin_log("Envoi d'un requ黎e au serveur de logins pour changer un m駑o.\n");
-	} else {
-		ladmin_log("Request to login-server to change a memo.\n");
-	}
+	ladmin_log("Request to login-server to change a memo.\n");
 
 	WFIFOW(login_fd,0) = 0x7942;
 	memcpy(WFIFOP(login_fd,2), name, 24);
@@ -2239,20 +1545,12 @@ int nameaccount(int id)
 {
 	WFIFOHEAD(login_fd,6);
 	if (id < 0) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un id ayant une valeur positive svp.\n");
-			ladmin_log("Id n馮atif donn� pour rechecher le nom d'un compte (commande 'name').\n");
-		} else {
-			ShowMessage("Please input a positive value for the id.\n");
-			ladmin_log("Negativ id given to search an account name ('name' command).\n");
-		}
+		ShowMessage("Please input a positive value for the id.\n");
+		ladmin_log("Negativ id given to search an account name ('name' command).\n");
 		return 136;
 	}
 
-	if (defaultlanguage == 'F')
-		ladmin_log("Envoi d'un requ黎e au serveur de logins pour conna�tre le nom d'un compte.\n");
-	else
-		ladmin_log("Request to login-server to know an account name.\n");
+	ladmin_log("Request to login-server to know an account name.\n");
 
 	WFIFOW(login_fd,0) = 0x7946;
 	WFIFOL(login_fd,2) = id;
@@ -2277,15 +1575,9 @@ int changepasswd(char* param)
 	if (sscanf(param, "\"%[^\"]\" %[^\r\n]", name, password) < 1 &&
 	    sscanf(param, "'%[^']' %[^\r\n]", name, password) < 1 &&
 	    sscanf(param, "%s %[^\r\n]", name, password) < 1) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un nom de compte svp.\n");
-			ShowMessage("<exemple> passwd nomtest nouveaumotdepasse\n");
-			ladmin_log("Nombre incorrect de param鑼res pour changer le mot d'un passe d'un compte (commande 'password').\n");
-		} else {
-			ShowMessage("Please input an account name.\n");
-			ShowMessage("<example> passwd testname newpassword\n");
-			ladmin_log("Incomplete parameters to change the password of an account ('password' command).\n");
-		}
+		ShowMessage("Please input an account name.\n");
+		ShowMessage("<example> passwd testname newpassword\n");
+		ladmin_log("Incomplete parameters to change the password of an account ('password' command).\n");
 		return 136;
 	}
 
@@ -2300,11 +1592,7 @@ int changepasswd(char* param)
 	if (verify_password(password) == 0)
 		return 131;
 
-	if (defaultlanguage == 'F') {
-		ladmin_log("Envoi d'un requ黎e au serveur de logins pour changer un mot de passe.\n");
-	} else {
-		ladmin_log("Request to login-server to change a password.\n");
-	}
+	ladmin_log("Request to login-server to change a password.\n");
 
 	WFIFOW(login_fd,0) = 0x7934;
 	memcpy(WFIFOP(login_fd,2), name, 24);
@@ -2326,15 +1614,9 @@ int reloadGM(void)
 	WFIFOSET(login_fd,2);
 	bytes_to_read = 0;
 
-	if (defaultlanguage == 'F') {
-		ladmin_log("Demande de recharger le fichier de configuration des GM envoy馥.\n");
-		ShowMessage("Demande de recharger le fichier de configuration des GM envoy馥.\n");
-		ShowMessage("V駻ifiez les comptes GM actuels (apr鑚 rechargement):\n");
-	} else {
-		ladmin_log("Request to reload the GM configuration file sended.\n");
-		ShowMessage("Request to reload the GM configuration file sended.\n");
-		ShowMessage("Check the actual GM accounts (after reloading):\n");
-	}
+	ladmin_log("Request to reload the GM configuration file sended.\n");
+	ShowMessage("Request to reload the GM configuration file sended.\n");
+	ShowMessage("Check the actual GM accounts (after reloading):\n");
 	listaccount(parameters, 1); // 1: to list only GM
 
 	return 180;
@@ -2354,15 +1636,9 @@ int changesex(char* param)
 	if (sscanf(param, "\"%[^\"]\" %[^\r\n]", name, sex) < 2 &&
 	    sscanf(param, "'%[^']' %[^\r\n]", name, sex) < 2 &&
 	    sscanf(param, "%s %[^\r\n]", name, sex) < 2) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un nom de compte et un sexe svp.\n");
-			ShowMessage("<exemple> sex nomtest Male\n");
-			ladmin_log("Nombre incorrect de param鑼res pour changer le sexe d'un compte (commande 'sex').\n");
-		} else {
-			ShowMessage("Please input an account name and a sex.\n");
-			ShowMessage("<example> sex testname Male\n");
-			ladmin_log("Incomplete parameters to change the sex of an account ('sex' command).\n");
-		}
+		ShowMessage("Please input an account name and a sex.\n");
+		ShowMessage("<example> sex testname Male\n");
+		ladmin_log("Incomplete parameters to change the sex of an account ('sex' command).\n");
 		return 136;
 	}
 
@@ -2372,21 +1648,12 @@ int changesex(char* param)
 
 	sex[0] = TOUPPER(sex[0]);
 	if (strchr("MF", sex[0]) == NULL) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Sexe incorrect [%s]. Entrez M ou F svp.\n", sex);
-			ladmin_log("Sexe incorrect [%s]. Entrez M ou F svp.\n", sex);
-		} else {
-			ShowMessage("Illegal gender [%s]. Please input M or F.\n", sex);
-			ladmin_log("Illegal gender [%s]. Please input M or F.\n", sex);
-		}
+		ShowMessage("Illegal gender [%s]. Please input M or F.\n", sex);
+		ladmin_log("Illegal gender [%s]. Please input M or F.\n", sex);
 		return 103;
 	}
 
-	if (defaultlanguage == 'F') {
-		ladmin_log("Envoi d'un requ黎e au serveur de logins pour changer un sexe.\n");
-	} else {
-		ladmin_log("Request to login-server to change a sex.\n");
-	}
+	ladmin_log("Request to login-server to change a sex.\n");
 
 	WFIFOW(login_fd,0) = 0x793c;
 	memcpy(WFIFOP(login_fd,2), name, 24);
@@ -2410,31 +1677,18 @@ int changestatesub(char* name, int state, char* error_message7)
 	strncpy(error_message, error_message7, sizeof(error_message)-1);
 
 	if ((state < 0 || state > 9) && state != 100) { // Valid values: 0: ok, or value of the 0x006a packet + 1
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez une des statuts suivantes svp:\n");
-			ShowMessage("  0 = Compte ok             6 = Your Game's EXE file is not the latest version\n");
-		} else {
-			ShowMessage("Please input one of these states:\n");
-			ShowMessage("  0 = Account ok            6 = Your Game's EXE file is not the latest version\n");
-		}
+		ShowMessage("Please input one of these states:\n");
+		ShowMessage("  0 = Account ok            6 = Your Game's EXE file is not the latest version\n");
 		ShowMessage("  1 = Unregistered ID       7 = You are Prohibited to log in until + message\n");
 		ShowMessage("  2 = Incorrect Password    8 = Server is jammed due to over populated\n");
 		ShowMessage("  3 = This ID is expired    9 = No MSG\n");
 		ShowMessage("  4 = Rejected from Server  100 = This ID has been totally erased\n");
 		ShowMessage("  5 = You have been blocked by the GM Team\n");
-		if (defaultlanguage == 'F') {
-			ShowMessage("<exemples> state nomtest 5\n");
-			ShowMessage("           state nomtest 7 fin de votre ban\n");
-			ShowMessage("           block <nom compte>\n");
-			ShowMessage("           unblock <nom compte>\n");
-			ladmin_log("Valeur incorrecte pour le statut d'un compte (commande 'state', 'block' ou 'unblock').\n");
-		} else {
-			ShowMessage("<examples> state testname 5\n");
-			ShowMessage("           state testname 7 end of your ban\n");
-			ShowMessage("           block <account name>\n");
-			ShowMessage("           unblock <account name>\n");
-			ladmin_log("Invalid value for the state of an account ('state', 'block' or 'unblock' command).\n");
-		}
+		ShowMessage("<examples> state testname 5\n");
+		ShowMessage("           state testname 7 end of your ban\n");
+		ShowMessage("           block <account name>\n");
+		ShowMessage("           unblock <account name>\n");
+		ladmin_log("Invalid value for the state of an account ('state', 'block' or 'unblock' command).\n");
 		return 151;
 	}
 
@@ -2446,32 +1700,18 @@ int changestatesub(char* name, int state, char* error_message7)
 		strcpy(error_message, "-");
 	} else {
 		if (strlen(error_message) < 1) {
-			if (defaultlanguage == 'F') {
-				ShowMessage("Message d'erreur trop court. Entrez un message de 1-19 caract鑽es.\n");
-				ladmin_log("Message d'erreur trop court. Entrez un message de 1-19 caract鑽es.\n");
-			} else {
-				ShowMessage("Error message is too short. Please input a message of 1-19 bytes.\n");
-				ladmin_log("Error message is too short. Please input a message of 1-19 bytes.\n");
-			}
+			ShowMessage("Error message is too short. Please input a message of 1-19 bytes.\n");
+			ladmin_log("Error message is too short. Please input a message of 1-19 bytes.\n");
 			return 102;
 		}
 		if (strlen(error_message) > 19) {
-			if (defaultlanguage == 'F') {
-				ShowMessage("Message d'erreur trop long. Entrez un message de 1-19 caract鑽es.\n");
-				ladmin_log("Message d'erreur trop long. Entrez un message de 1-19 caract鑽es.\n");
-			} else {
-				ShowMessage("Error message is too long. Please input a message of 1-19 bytes.\n");
-				ladmin_log("Error message is too long. Please input a message of 1-19 bytes.\n");
-			}
+			ShowMessage("Error message is too long. Please input a message of 1-19 bytes.\n");
+			ladmin_log("Error message is too long. Please input a message of 1-19 bytes.\n");
 			return 102;
 		}
 	}
 
-	if (defaultlanguage == 'F') {
-		ladmin_log("Envoi d'un requ黎e au serveur de logins pour changer un statut.\n");
-	} else {
-		ladmin_log("Request to login-server to change a state.\n");
-	}
+	ladmin_log("Request to login-server to change a state.\n");
 
 	WFIFOW(login_fd,0) = 0x7936;
 	memcpy(WFIFOP(login_fd,2), name, 24);
@@ -2497,21 +1737,12 @@ int changestate(char* param)
 	if (sscanf(param, "\"%[^\"]\" %d %[^\r\n]", name, &state, error_message) < 2 &&
 	    sscanf(param, "'%[^']' %d %[^\r\n]", name, &state, error_message) < 2 &&
 	    sscanf(param, "%s %d %[^\r\n]", name, &state, error_message) < 2) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un nom de compte et un statut svp.\n");
-			ShowMessage("<exemples> state nomtest 5\n");
-			ShowMessage("           state nomtest 7 fin de votre ban\n");
-			ShowMessage("           block <nom compte>\n");
-			ShowMessage("           unblock <nom compte>\n");
-			ladmin_log("Nombre incorrect de param鑼res pour changer le statut d'un compte (commande 'state').\n");
-		} else {
-			ShowMessage("Please input an account name and a state.\n");
-			ShowMessage("<examples> state testname 5\n");
-			ShowMessage("           state testname 7 end of your ban\n");
-			ShowMessage("           block <account name>\n");
-			ShowMessage("           unblock <account name>\n");
-			ladmin_log("Incomplete parameters to change the state of an account ('state' command).\n");
-		}
+		ShowMessage("Please input an account name and a state.\n");
+		ShowMessage("<examples> state testname 5\n");
+		ShowMessage("           state testname 7 end of your ban\n");
+		ShowMessage("           block <account name>\n");
+		ShowMessage("           unblock <account name>\n");
+		ladmin_log("Incomplete parameters to change the state of an account ('state' command).\n");
 		return 136;
 	}
 
@@ -2531,22 +1762,14 @@ int unblockaccount(char* param)
 	    (sscanf(param, "\"%[^\"]\"", name) < 1 &&
 	     sscanf(param, "'%[^']'", name) < 1 &&
 	     sscanf(param, "%[^\r\n]", name) < 1) ||
-	     strlen(name) == 0) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un nom de compte svp.\n");
-			ShowMessage("<exemples> state nomtest 5\n");
-			ShowMessage("           state nomtest 7 fin de votre ban\n");
-			ShowMessage("           block <nom compte>\n");
-			ShowMessage("           unblock <nom compte>\n");
-			ladmin_log("Nombre incorrect de param鑼res pour changer le statut d'un compte (commande 'unblock').\n");
-		} else {
-			ShowMessage("Please input an account name.\n");
-			ShowMessage("<examples> state testname 5\n");
-			ShowMessage("           state testname 7 end of your ban\n");
-			ShowMessage("           block <account name>\n");
-			ShowMessage("           unblock <account name>\n");
-			ladmin_log("Incomplete parameters to change the state of an account ('unblock' command).\n");
-		}
+	     strlen(name) == 0)
+	{
+		ShowMessage("Please input an account name.\n");
+		ShowMessage("<examples> state testname 5\n");
+		ShowMessage("           state testname 7 end of your ban\n");
+		ShowMessage("           block <account name>\n");
+		ShowMessage("           unblock <account name>\n");
+		ladmin_log("Incomplete parameters to change the state of an account ('unblock' command).\n");
 		return 136;
 	}
 
@@ -2566,22 +1789,14 @@ int blockaccount(char* param)
 	    (sscanf(param, "\"%[^\"]\"", name) < 1 &&
 	     sscanf(param, "'%[^']'", name) < 1 &&
 	     sscanf(param, "%[^\r\n]", name) < 1) ||
-	     strlen(name) == 0) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un nom de compte svp.\n");
-			ShowMessage("<exemples> state nomtest 5\n");
-			ShowMessage("           state nomtest 7 fin de votre ban\n");
-			ShowMessage("           block <nom compte>\n");
-			ShowMessage("           unblock <nom compte>\n");
-			ladmin_log("Nombre incorrect de param鑼res pour changer le statut d'un compte (commande 'block').\n");
-		} else {
-			ShowMessage("Please input an account name.\n");
-			ShowMessage("<examples> state testname 5\n");
-			ShowMessage("           state testname 7 end of your ban\n");
-			ShowMessage("           block <account name>\n");
-			ShowMessage("           unblock <account name>\n");
-			ladmin_log("Incomplete parameters to change the state of an account ('block' command).\n");
-		}
+	     strlen(name) == 0)
+	{
+		ShowMessage("Please input an account name.\n");
+		ShowMessage("<examples> state testname 5\n");
+		ShowMessage("           state testname 7 end of your ban\n");
+		ShowMessage("           block <account name>\n");
+		ShowMessage("           unblock <account name>\n");
+		ladmin_log("Incomplete parameters to change the state of an account ('block' command).\n");
 		return 136;
 	}
 
@@ -2605,20 +1820,13 @@ int timeaddaccount(char* param)
 
 	if (sscanf(param, "\"%[^\"]\" %[^\r\n]", name, modif) < 2 &&
 	    sscanf(param, "'%[^']' %[^\r\n]", name, modif) < 2 &&
-	    sscanf(param, "%s %[^\r\n]", name, modif) < 2) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un nom de compte et un modificateur svp.\n");
-			ShowMessage("  <exemple> timeadd nomtest +1m-2mn1s-6y\n");
-			ShowMessage("            Cette exemple ajoute 1 mois et 1 seconde, et soustrait 2 minutes\n");
-			ShowMessage("            et 6 ans dans le m麥e temps.\n");
-			ladmin_log("Nombre incorrect de param鑼res pour modifier une date limite d'utilisation (commande 'timeadd').\n");
-		} else {
-			ShowMessage("Please input an account name and a modifier.\n");
-			ShowMessage("  <example>: timeadd testname +1m-2mn1s-6y\n");
-			ShowMessage("             this example adds 1 month and 1 second, and substracts 2 minutes\n");
-			ShowMessage("             and 6 years at the same time.\n");
-			ladmin_log("Incomplete parameters to modify a limit time ('timeadd' command).\n");
-		}
+	    sscanf(param, "%s %[^\r\n]", name, modif) < 2)
+	{
+		ShowMessage("Please input an account name and a modifier.\n");
+		ShowMessage("  <example>: timeadd testname +1m-2mn1s-6y\n");
+		ShowMessage("             this example adds 1 month and 1 second, and substracts 2 minutes\n");
+		ShowMessage("             and 6 years at the same time.\n");
+		ladmin_log("Incomplete parameters to modify a limit time ('timeadd' command).\n");
 		return 136;
 	}
 	if (verify_accountname(name) == 0) {
@@ -2663,120 +1871,61 @@ int timeaddaccount(char* param)
 		}
 	}
 
-	if (defaultlanguage == 'F') {
-		ShowMessage(" ann馥:   %d\n", year);
-		ShowMessage(" mois:    %d\n", month);
-		ShowMessage(" jour:    %d\n", day);
-		ShowMessage(" heure:   %d\n", hour);
-		ShowMessage(" minute:  %d\n", minute);
-		ShowMessage(" seconde: %d\n", second);
-	} else {
-		ShowMessage(" year:   %d\n", year);
-		ShowMessage(" month:  %d\n", month);
-		ShowMessage(" day:    %d\n", day);
-		ShowMessage(" hour:   %d\n", hour);
-		ShowMessage(" minute: %d\n", minute);
-		ShowMessage(" second: %d\n", second);
-	}
+	ShowMessage(" year:   %d\n", year);
+	ShowMessage(" month:  %d\n", month);
+	ShowMessage(" day:    %d\n", day);
+	ShowMessage(" hour:   %d\n", hour);
+	ShowMessage(" minute: %d\n", minute);
+	ShowMessage(" second: %d\n", second);
 
 	if (year == 0 && month == 0 && day == 0 && hour == 0 && minute == 0 && second == 0) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Vous devez entrer un ajustement avec cette commande, svp:\n");
-			ShowMessage("  Valeur d'ajustement (-1, 1, +1, etc...)\n");
-			ShowMessage("  El駑ent modifi�:\n");
-			ShowMessage("    a ou y: ann馥\n");
-			ShowMessage("    m:      mois\n");
-			ShowMessage("    j ou d: jour\n");
-			ShowMessage("    h:      heure\n");
-			ShowMessage("    mn:     minute\n");
-			ShowMessage("    s:      seconde\n");
-			ShowMessage("  <exemple> timeadd nomtest +1m-2mn1s-6y\n");
-			ShowMessage("            Cette exemple ajoute 1 mois et 1 seconde, et soustrait 2 minutes\n");
-			ShowMessage("            et 6 ans dans le m麥e temps.\n");
-			ladmin_log("Aucun ajustement n'est pas un ajustement (commande 'timeadd').\n");
-		} else {
-			ShowMessage("Please give an adjustment with this command:\n");
-			ShowMessage("  Adjustment value (-1, 1, +1, etc...)\n");
-			ShowMessage("  Modified element:\n");
-			ShowMessage("    a or y: year\n");
-			ShowMessage("    m:      month\n");
-			ShowMessage("    j or d: day\n");
-			ShowMessage("    h:      hour\n");
-			ShowMessage("    mn:     minute\n");
-			ShowMessage("    s:      second\n");
-			ShowMessage("  <example> timeadd testname +1m-2mn1s-6y\n");
-			ShowMessage("            this example adds 1 month and 1 second, and substracts 2 minutes\n");
-			ShowMessage("            and 6 years at the same time.\n");
-			ladmin_log("No adjustment isn't an adjustment ('timeadd' command).\n");
-		}
+		ShowMessage("Please give an adjustment with this command:\n");
+		ShowMessage("  Adjustment value (-1, 1, +1, etc...)\n");
+		ShowMessage("  Modified element:\n");
+		ShowMessage("    a or y: year\n");
+		ShowMessage("    m:      month\n");
+		ShowMessage("    j or d: day\n");
+		ShowMessage("    h:      hour\n");
+		ShowMessage("    mn:     minute\n");
+		ShowMessage("    s:      second\n");
+		ShowMessage("  <example> timeadd testname +1m-2mn1s-6y\n");
+		ShowMessage("            this example adds 1 month and 1 second, and substracts 2 minutes\n");
+		ShowMessage("            and 6 years at the same time.\n");
+		ladmin_log("No adjustment isn't an adjustment ('timeadd' command).\n");
 		return 137;
 	}
 	if (year > 127 || year < -127) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un ajustement d'ann馥s correct (de -127 � 127), svp.\n");
-			ladmin_log("Ajustement de l'ann馥 hors norme ('timeadd' command).\n");
-		} else {
-			ShowMessage("Please give a correct adjustment for the years (from -127 to 127).\n");
-			ladmin_log("Abnormal adjustment for the year ('timeadd' command).\n");
-		}
+		ShowMessage("Please give a correct adjustment for the years (from -127 to 127).\n");
+		ladmin_log("Abnormal adjustment for the year ('timeadd' command).\n");
 		return 137;
 	}
 	if (month > 255 || month < -255) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un ajustement de mois correct (de -255 � 255), svp.\n");
-			ladmin_log("Ajustement du mois hors norme ('timeadd' command).\n");
-		} else {
-			ShowMessage("Please give a correct adjustment for the months (from -255 to 255).\n");
-			ladmin_log("Abnormal adjustment for the month ('timeadd' command).\n");
-		}
+		ShowMessage("Please give a correct adjustment for the months (from -255 to 255).\n");
+		ladmin_log("Abnormal adjustment for the month ('timeadd' command).\n");
 		return 137;
 	}
 	if (day > 32767 || day < -32767) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un ajustement de jours correct (de -32767 � 32767), svp.\n");
-			ladmin_log("Ajustement des jours hors norme ('timeadd' command).\n");
-		} else {
-			ShowMessage("Please give a correct adjustment for the days (from -32767 to 32767).\n");
-			ladmin_log("Abnormal adjustment for the days ('timeadd' command).\n");
-		}
+		ShowMessage("Please give a correct adjustment for the days (from -32767 to 32767).\n");
+		ladmin_log("Abnormal adjustment for the days ('timeadd' command).\n");
 		return 137;
 	}
 	if (hour > 32767 || hour < -32767) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un ajustement d'heures correct (de -32767 � 32767), svp.\n");
-			ladmin_log("Ajustement des heures hors norme ('timeadd' command).\n");
-		} else {
-			ShowMessage("Please give a correct adjustment for the hours (from -32767 to 32767).\n");
-			ladmin_log("Abnormal adjustment for the hours ('timeadd' command).\n");
-		}
+		ShowMessage("Please give a correct adjustment for the hours (from -32767 to 32767).\n");
+		ladmin_log("Abnormal adjustment for the hours ('timeadd' command).\n");
 		return 137;
 	}
 	if (minute > 32767 || minute < -32767) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un ajustement de minutes correct (de -32767 � 32767), svp.\n");
-			ladmin_log("Ajustement des minutes hors norme ('timeadd' command).\n");
-		} else {
-			ShowMessage("Please give a correct adjustment for the minutes (from -32767 to 32767).\n");
-			ladmin_log("Abnormal adjustment for the minutes ('timeadd' command).\n");
-		}
+		ShowMessage("Please give a correct adjustment for the minutes (from -32767 to 32767).\n");
+		ladmin_log("Abnormal adjustment for the minutes ('timeadd' command).\n");
 		return 137;
 	}
 	if (second > 32767 || second < -32767) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un ajustement de secondes correct (de -32767 � 32767), svp.\n");
-			ladmin_log("Ajustement des secondes hors norme ('timeadd' command).\n");
-		} else {
-			ShowMessage("Please give a correct adjustment for the seconds (from -32767 to 32767).\n");
-			ladmin_log("Abnormal adjustment for the seconds ('timeadd' command).\n");
-		}
+		ShowMessage("Please give a correct adjustment for the seconds (from -32767 to 32767).\n");
+		ladmin_log("Abnormal adjustment for the seconds ('timeadd' command).\n");
 		return 137;
 	}
 
-	if (defaultlanguage == 'F') {
-		ladmin_log("Envoi d'un requ黎e au serveur de logins pour modifier une date limite d'utilisation.\n");
-	} else {
-		ladmin_log("Request to login-server to modify a time limit.\n");
-	}
+	ladmin_log("Request to login-server to modify a time limit.\n");
 
 	WFIFOW(login_fd,0) = 0x7950;
 	memcpy(WFIFOP(login_fd,2), name, 24);
@@ -2813,19 +1962,11 @@ int timesetaccount(char* param)
 	if (sscanf(param, "\"%[^\"]\" %s %[^\r\n]", name, date, time) < 2 && // if date = 0, time can be void
 	    sscanf(param, "'%[^']' %s %[^\r\n]", name, date, time) < 2 && // if date = 0, time can be void
 	    sscanf(param, "%s %s %[^\r\n]", name, date, time) < 2) { // if date = 0, time can be void
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un nom de compte, une date et une heure svp.\n");
-			ShowMessage("<exemple>: timeset <nom_du_compte> aaaa/mm/jj [hh:mm:ss]\n");
-			ShowMessage("           timeset <nom_du_compte> 0    (0 = illimit�)\n");
-			ShowMessage("           Heure par d馭aut [hh:mm:ss]: 23:59:59.\n");
-			ladmin_log("Nombre incorrect de param鑼res pour fixer une date limite d'utilisation (commande 'timeset').\n");
-		} else {
-			ShowMessage("Please input an account name, a date and a hour.\n");
-			ShowMessage("<example>: timeset <account_name> yyyy/mm/dd [hh:mm:ss]\n");
-			ShowMessage("           timeset <account_name> 0   (0 = unlimited)\n");
-			ShowMessage("           Default time [hh:mm:ss]: 23:59:59.\n");
-			ladmin_log("Incomplete parameters to set a limit time ('timeset' command).\n");
-		}
+		ShowMessage("Please input an account name, a date and a hour.\n");
+		ShowMessage("<example>: timeset <account_name> yyyy/mm/dd [hh:mm:ss]\n");
+		ShowMessage("           timeset <account_name> 0   (0 = unlimited)\n");
+		ShowMessage("           Default time [hh:mm:ss]: 23:59:59.\n");
+		ladmin_log("Incomplete parameters to set a limit time ('timeset' command).\n");
 		return 136;
 	}
 	if (verify_accountname(name) == 0) {
@@ -2840,14 +1981,10 @@ int timesetaccount(char* param)
 	      sscanf(date, "%d-%d-%d", &year, &month, &day) < 3 &&
 	      sscanf(date, "%d.%d.%d", &year, &month, &day) < 3 &&
 	      sscanf(date, "%d'%d'%d", &year, &month, &day) < 3) ||
-	     sscanf(time, "%d:%d:%d", &hour, &minute, &second) < 3)) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez 0 ou une date et une heure svp (format: 0 ou aaaa/mm/jj hh:mm:ss).\n");
-			ladmin_log("Format incorrect pour la date/heure ('timeset' command).\n");
-		} else {
-			ShowMessage("Please input 0 or a date and a time (format: 0 or yyyy/mm/dd hh:mm:ss).\n");
-			ladmin_log("Invalid format for the date/time ('timeset' command).\n");
-		}
+	     sscanf(time, "%d:%d:%d", &hour, &minute, &second) < 3))
+	{
+		ShowMessage("Please input 0 or a date and a time (format: 0 or yyyy/mm/dd hh:mm:ss).\n");
+		ladmin_log("Invalid format for the date/time ('timeset' command).\n");
 		return 102;
 	}
 
@@ -2861,65 +1998,35 @@ int timesetaccount(char* param)
 			year = year - 1900;
 		}
 		if (month < 1 || month > 12) {
-			if (defaultlanguage == 'F') {
-				ShowMessage("Entrez un mois correct svp (entre 1 et 12).\n");
-				ladmin_log("Mois incorrect pour la date ('timeset' command).\n");
-			} else {
-				ShowMessage("Please give a correct value for the month (from 1 to 12).\n");
-				ladmin_log("Invalid month for the date ('timeset' command).\n");
-			}
+			ShowMessage("Please give a correct value for the month (from 1 to 12).\n");
+			ladmin_log("Invalid month for the date ('timeset' command).\n");
 			return 102;
 		}
 		month = month - 1;
 		if (day < 1 || day > 31) {
-			if (defaultlanguage == 'F') {
-				ShowMessage("Entrez un jour correct svp (entre 1 et 31).\n");
-				ladmin_log("Jour incorrect pour la date ('timeset' command).\n");
-			} else {
-				ShowMessage("Please give a correct value for the day (from 1 to 31).\n");
-				ladmin_log("Invalid day for the date ('timeset' command).\n");
-			}
+			ShowMessage("Please give a correct value for the day (from 1 to 31).\n");
+			ladmin_log("Invalid day for the date ('timeset' command).\n");
 			return 102;
 		}
 		if (((month == 3 || month == 5 || month == 8 || month == 10) && day > 30) ||
 		    (month == 1 && day > 29)) {
-			if (defaultlanguage == 'F') {
-				ShowMessage("Entrez un jour correct en fonction du mois (%d) svp.\n", month);
-				ladmin_log("Jour incorrect pour ce mois correspondant ('timeset' command).\n");
-			} else {
-				ShowMessage("Please give a correct value for a day of this month (%d).\n", month);
-				ladmin_log("Invalid day for this month ('timeset' command).\n");
-			}
+			ShowMessage("Please give a correct value for a day of this month (%d).\n", month);
+			ladmin_log("Invalid day for this month ('timeset' command).\n");
 			return 102;
 		}
 		if (hour < 0 || hour > 23) {
-			if (defaultlanguage == 'F') {
-				ShowMessage("Entrez une heure correcte svp (entre 0 et 23).\n");
-				ladmin_log("Heure incorrecte pour l'heure ('timeset' command).\n");
-			} else {
-				ShowMessage("Please give a correct value for the hour (from 0 to 23).\n");
-				ladmin_log("Invalid hour for the time ('timeset' command).\n");
-			}
+			ShowMessage("Please give a correct value for the hour (from 0 to 23).\n");
+			ladmin_log("Invalid hour for the time ('timeset' command).\n");
 			return 102;
 		}
 		if (minute < 0 || minute > 59) {
-			if (defaultlanguage == 'F') {
-				ShowMessage("Entrez des minutes correctes svp (entre 0 et 59).\n");
-				ladmin_log("Minute incorrecte pour l'heure ('timeset' command).\n");
-			} else {
-				ShowMessage("Please give a correct value for the minutes (from 0 to 59).\n");
-				ladmin_log("Invalid minute for the time ('timeset' command).\n");
-			}
+			ShowMessage("Please give a correct value for the minutes (from 0 to 59).\n");
+			ladmin_log("Invalid minute for the time ('timeset' command).\n");
 			return 102;
 		}
 		if (second < 0 || second > 59) {
-			if (defaultlanguage == 'F') {
-				ShowMessage("Entrez des secondes correctes svp (entre 0 et 59).\n");
-				ladmin_log("Seconde incorrecte pour l'heure ('timeset' command).\n");
-			} else {
-				ShowMessage("Please give a correct value for the seconds (from 0 to 59).\n");
-				ladmin_log("Invalid second for the time ('timeset' command).\n");
-			}
+			ShowMessage("Please give a correct value for the seconds (from 0 to 59).\n");
+			ladmin_log("Invalid second for the time ('timeset' command).\n");
 			return 102;
 		}
 		tmtime->tm_year = year;
@@ -2931,24 +2038,14 @@ int timesetaccount(char* param)
 		tmtime->tm_isdst = -1; // -1: no winter/summer time modification
 		expiration_time = mktime(tmtime);
 		if (expiration_time == -1) {
-			if (defaultlanguage == 'F') {
-				ShowMessage("Date incorrecte.\n");
-				ShowMessage("Ajoutez 0 ou une date et une heure svp (format: 0 ou aaaa/mm/jj hh:mm:ss).\n");
-				ladmin_log("Date incorrecte. ('timeset' command).\n");
-			} else {
-				ShowMessage("Invalid date.\n");
-				ShowMessage("Please add 0 or a date and a time (format: 0 or yyyy/mm/dd hh:mm:ss).\n");
-				ladmin_log("Invalid date. ('timeset' command).\n");
-			}
+			ShowMessage("Invalid date.\n");
+			ShowMessage("Please add 0 or a date and a time (format: 0 or yyyy/mm/dd hh:mm:ss).\n");
+			ladmin_log("Invalid date. ('timeset' command).\n");
 			return 102;
 		}
 	}
 
-	if (defaultlanguage == 'F') {
-		ladmin_log("Envoi d'un requ黎e au serveur de logins pour fixer une date limite d'utilisation.\n");
-	} else {
-		ladmin_log("Request to login-server to set a time limit.\n");
-	}
+	ladmin_log("Request to login-server to set a time limit.\n");
 
 	WFIFOW(login_fd,0) = 0x7948;
 	memcpy(WFIFOP(login_fd,2), name, 24);
@@ -2973,27 +2070,18 @@ int whoaccount(char* param)
 	    (sscanf(param, "\"%[^\"]\"", name) < 1 &&
 	     sscanf(param, "'%[^']'", name) < 1 &&
 	     sscanf(param, "%[^\r\n]", name) < 1) ||
-	     strlen(name) == 0) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Entrez un nom de compte svp.\n");
-			ShowMessage("<exemple> who nomtest\n");
-			ladmin_log("Aucun nom n'a 騁� donn� pour trouver le compte.\n");
-		} else {
-			ShowMessage("Please input an account name.\n");
-			ShowMessage("<example> who testname\n");
-			ladmin_log("No name was given to found the account.\n");
-		}
+	     strlen(name) == 0)
+	{
+		ShowMessage("Please input an account name.\n");
+		ShowMessage("<example> who testname\n");
+		ladmin_log("No name was given to found the account.\n");
 		return 136;
 	}
 	if (verify_accountname(name) == 0) {
 		return 102;
 	}
 
-	if (defaultlanguage == 'F') {
-		ladmin_log("Envoi d'un requ黎e au serveur de logins pour obtenir le information d'un compte (par le nom).\n");
-	} else {
-		ladmin_log("Request to login-server to obtain information about an account (by its name).\n");
-	}
+	ladmin_log("Request to login-server to obtain information about an account (by its name).\n");
 
 	WFIFOW(login_fd,0) = 0x7952;
 	memcpy(WFIFOP(login_fd,2), name, 24);
@@ -3009,10 +2097,7 @@ int whoaccount(char* param)
 int checkloginversion(void)
 {
 	WFIFOHEAD(login_fd,2);
-	if (defaultlanguage == 'F')
-		ladmin_log("Envoi d'un requ黎e au serveur de logins pour obtenir sa version.\n");
-	else
-		ladmin_log("Request to login-server to obtain its version.\n");
+	ladmin_log("Request to login-server to obtain its version.\n");
 
 	WFIFOW(login_fd,0) = 0x7530;
 	WFIFOSET(login_fd,2);
@@ -3042,10 +2127,7 @@ int prompt(void)
 		// \033[0m : reset color parameter
 		// \033[1m : use bold for font
 		ShowMessage("\n");
-		if (defaultlanguage == 'F')
-			ShowMessage("\033[32mPour afficher les commandes, tapez 'Entr馥'.\033[0m\n");
-		else
-			ShowMessage("\033[32mTo list the commands, type 'enter'.\033[0m\n");
+		ShowMessage("\033[32mTo list the commands, type 'enter'.\033[0m\n");
 		ShowMessage("\033[0;36mLadmin-> \033[0m");
 		ShowMessage("\033[1m");
 		fflush(stdout);
@@ -3107,38 +2189,23 @@ int prompt(void)
 			command[i] = TOLOWER(command[i]);
 
 		if (command[0] == '?' || strlen(command) == 0) {
-			if (defaultlanguage == 'F') {
-				strcpy(buf, "aide");
-				strcpy(command, "aide");
-			} else {
-				strcpy(buf, "help");
-				strcpy(command, "help");
-			}
+			strcpy(buf, "help");
+			strcpy(command, "help");
 		}
 
 		// Analyse of the command
 		check_command(command); // give complete name to the command
 
 		if (strlen(parameters) == 0) {
-			if (defaultlanguage == 'F') {
-				ladmin_log("Commande: '%s' (sans param鑼re)\n", command, parameters);
-			} else {
-				ladmin_log("Command: '%s' (without parameters)\n", command, parameters);
-			}
+			ladmin_log("Command: '%s' (without parameters)\n", command, parameters);
 		} else {
-			if (defaultlanguage == 'F') {
-				ladmin_log("Commande: '%s', param鑼res: '%s'\n", command, parameters);
-			} else {
-				ladmin_log("Command: '%s', parameters: '%s'\n", command, parameters);
-			}
+			ladmin_log("Command: '%s', parameters: '%s'\n", command, parameters);
 		}
 
 		// Analyse of the command
 // help
-		if (strcmp(command, "aide") == 0) {
-			display_help(parameters, 1); // 1: french
-		} else if (strcmp(command, "help") == 0 ) {
-			display_help(parameters, 0); // 0: english
+		if (strcmp(command, "help") == 0 ) {
+			display_help(parameters);
 // general commands
 		} else if (strcmp(command, "add") == 0) {
 			addaccount(parameters, 0); // 0: no email
@@ -3170,8 +2237,6 @@ int prompt(void)
 			sendbroadcast(0, parameters); // flag for normal
 		} else if (strcmp(command, "kamib") == 0) {
 			sendbroadcast(0x10, parameters); // flag for blue
-		} else if (strcmp(command, "language") == 0) {
-			changelanguage(parameters);
 		} else if (strcmp(command, "list") == 0) {
 			listaccount(parameters, 0); // 0: to list all
 		} else if (strcmp(command, "listban") == 0) {
@@ -3210,21 +2275,12 @@ int prompt(void)
 		} else if (strcmp(command, "quit") == 0 ||
 		           strcmp(command, "exit") == 0 ||
 		           strcmp(command, "end") == 0) {
-			if (defaultlanguage == 'F') {
-				ShowMessage("Au revoir.\n");
-			} else {
-				ShowMessage("Bye.\n");
-			}
+			ShowMessage("Bye.\n");
 			exit(EXIT_SUCCESS);
 // unknown command
 		} else {
-			if (defaultlanguage == 'F') {
-				ShowMessage("Commande inconnue [%s].\n", buf);
-				ladmin_log("Commande inconnue [%s].\n", buf);
-			} else {
-				ShowMessage("Unknown command [%s].\n", buf);
-				ladmin_log("Unknown command [%s].\n", buf);
-			}
+			ShowMessage("Unknown command [%s].\n", buf);
+			ladmin_log("Unknown command [%s].\n", buf);
 		}
 	}
 
@@ -3240,13 +2296,8 @@ int parse_fromlogin(int fd)
 	int id;
 	RFIFOHEAD(fd);
 	if (session[fd]->flag.eof) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("Impossible de se connecter au serveur de login [%s:%d] !\n", loginserverip, loginserverport);
-			ladmin_log("Impossible de se connecter au serveur de login [%s:%d] !\n", loginserverip, loginserverport);
-		} else {
-			ShowMessage("Impossible to have a connection with the login-server [%s:%d] !\n", loginserverip, loginserverport);
-			ladmin_log("Impossible to have a connection with the login-server [%s:%d] !\n", loginserverip, loginserverport);
-		}
+		ShowMessage("Impossible to have a connection with the login-server [%s:%d] !\n", loginserverip, loginserverport);
+		ladmin_log("Impossible to have a connection with the login-server [%s:%d] !\n", loginserverip, loginserverport);
 		do_close(fd);
 		exit(EXIT_FAILURE);
 	}
@@ -3260,34 +2311,19 @@ int parse_fromlogin(int fd)
 			if (RFIFOREST(fd) < 3)
 				return 0;
 			if (RFIFOB(fd,2) != 0) {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Erreur de login:\n");
-					ShowMessage(" - mot de passe incorrect,\n");
-					ShowMessage(" - syst鑪e d'administration non activ�, ou\n");
-					ShowMessage(" - IP non autoris馥.\n");
-					ladmin_log("Erreur de login: mot de passe incorrect, syst鑪e d'administration non activ�, ou IP non autoris馥.\n");
-				} else {
-					ShowMessage("Error at login:\n");
-					ShowMessage(" - incorrect password,\n");
-					ShowMessage(" - administration system not activated, or\n");
-					ShowMessage(" - unauthorised IP.\n");
-					ladmin_log("Error at login: incorrect password, administration system not activated, or unauthorised IP.\n");
-				}
+				ShowMessage("Error at login:\n");
+				ShowMessage(" - incorrect password,\n");
+				ShowMessage(" - administration system not activated, or\n");
+				ShowMessage(" - unauthorised IP.\n");
+				ladmin_log("Error at login: incorrect password, administration system not activated, or unauthorised IP.\n");
 				set_eof(fd);
 				//bytes_to_read = 1; // not stop at prompt
 				return 0;
 			} else {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Connexion 騁ablie.\n");
-					ladmin_log("Connexion 騁ablie.\n");
-					ShowMessage("Lecture de la version du serveur de login...\n");
-					ladmin_log("Lecture de la version du serveur de login...\n");
-				} else {
-					ShowMessage("Established connection.\n");
-					ladmin_log("Established connection.\n");
-					ShowMessage("Reading of the version of the login-server...\n");
-					ladmin_log("Reading of the version of the login-server...\n");
-				}
+				ShowMessage("Established connection.\n");
+				ladmin_log("Established connection.\n");
+				ShowMessage("Reading of the version of the login-server...\n");
+				ladmin_log("Reading of the version of the login-server...\n");
 				//bytes_to_read = 1; // unchanged
 				checkloginversion();
 			}
@@ -3312,17 +2348,10 @@ int parse_fromlogin(int fd)
 			WFIFOW(login_fd,2) = passenc; // Encrypted type
 			memcpy(WFIFOP(login_fd,4), md5bin, 16);
 			WFIFOSET(login_fd,20);
-			if (defaultlanguage == 'F') {
-				ShowMessage("R馗eption de la clef MD5.\n");
-				ladmin_log("R馗eption de la clef MD5.\n");
-				ShowMessage("Envoi du mot de passe crypt�...\n");
-				ladmin_log("Envoi du mot de passe crypt�...\n");
-			} else {
-				ShowMessage("Receiving of the MD5 key.\n");
-				ladmin_log("Receiving of the MD5 key.\n");
-				ShowMessage("Sending of the encrypted password...\n");
-				ladmin_log("Sending of the encrypted password...\n");
-			}
+			ShowMessage("Receiving of the MD5 key.\n");
+			ladmin_log("Receiving of the MD5 key.\n");
+			ShowMessage("Sending of the encrypted password...\n");
+			ladmin_log("Sending of the encrypted password...\n");
 		  }
 			bytes_to_read = 1;
 			RFIFOSKIP(fd,RFIFOW(fd,2));
@@ -3351,31 +2380,18 @@ int parse_fromlogin(int fd)
 			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
 				return 0;
 			if (RFIFOW(fd,2) < 5) {
-				if (defaultlanguage == 'F') {
-					ladmin_log("  R馗eption d'une liste des comptes vide.\n");
-					if (list_count == 0)
-						ShowMessage("Aucun compte trouv�.\n");
-					else if (list_count == 1)
-						ShowMessage("1 compte trouv�.\n");
-					else
-						ShowMessage("%d comptes trouv駸.\n", list_count);
-				} else {
-					ladmin_log("  Receiving of a void accounts list.\n");
-					if (list_count == 0)
-						ShowMessage("No account found.\n");
-					else if (list_count == 1)
-						ShowMessage("1 account found.\n");
-					else
-						ShowMessage("%d accounts found.\n", list_count);
-				}
+				ladmin_log("  Receiving of a void accounts list.\n");
+				if (list_count == 0)
+					ShowMessage("No account found.\n");
+				else if (list_count == 1)
+					ShowMessage("1 account found.\n");
+				else
+					ShowMessage("%d accounts found.\n", list_count);
 				bytes_to_read = 0;
 			} else {
 				int i;
 				WFIFOHEAD(login_fd,10);
-				if (defaultlanguage == 'F')
-					ladmin_log("  R馗eption d'une liste des comptes.\n");
-				else
-					ladmin_log("  Receiving of a accounts list.\n");
+				ladmin_log("  Receiving of a accounts list.\n");
 				for(i = 4; i < RFIFOW(fd,2); i += 38) {
 					int j;
 					char userid[24];
@@ -3398,28 +2414,16 @@ int parse_fromlogin(int fd)
 						else
 							ShowMessage("%2d ", (int)RFIFOB(fd,i+4));
 						ShowMessage("%-24s", userid);
-						if (defaultlanguage == 'F') {
-							if (RFIFOB(fd,i+29) == 0)
-								ShowMessage("%-5s ", "Femme");
-							else if (RFIFOB(fd,i+29) == 1)
-								ShowMessage("%-5s ", "Male");
-							else
-								ShowMessage("%-5s ", "Servr");
-						} else {
-							if (RFIFOB(fd,i+29) == 0)
-								ShowMessage("%-5s ", "Femal");
-							else if (RFIFOB(fd,i+29) == 1)
-								ShowMessage("%-5s ", "Male");
-							else
-								ShowMessage("%-5s ", "Servr");
-						}
+						if (RFIFOB(fd,i+29) == 0)
+							ShowMessage("%-5s ", "Femal");
+						else if (RFIFOB(fd,i+29) == 1)
+							ShowMessage("%-5s ", "Male");
+						else
+							ShowMessage("%-5s ", "Servr");
 						ShowMessage("%6d ", (int)RFIFOL(fd,i+30));
 						switch(RFIFOL(fd,i+34)) {
 						case 0:
-							if (defaultlanguage == 'F')
-								ShowMessage("%-27s\n", "Compte Ok");
-							else
-								ShowMessage("%-27s\n", "Account OK");
+							ShowMessage("%-27s\n", "Account OK");
 							break;
 						case 1:
 							ShowMessage("%-27s\n", "Unregistered ID");
@@ -3457,10 +2461,7 @@ int parse_fromlogin(int fd)
 					}
 				}
 				// asking of the following acounts
-				if (defaultlanguage == 'F')
-					ladmin_log("Envoi d'un requ黎e au serveur de logins pour obtenir la liste des comptes de %d � %d (compl駑ent).\n", list_first, list_last);
-				else
-					ladmin_log("Request to login-server to obtain the list of accounts from %d to %d (complement).\n", list_first, list_last);
+				ladmin_log("Request to login-server to obtain the list of accounts from %d to %d (complement).\n", list_first, list_last);
 				WFIFOW(login_fd,0) = 0x7920;
 				WFIFOL(login_fd,2) = list_first;
 				WFIFOL(login_fd,6) = list_last;
@@ -3473,23 +2474,13 @@ int parse_fromlogin(int fd)
 		case 0x7931:	// Answer of login-server about an account creation
 			if (RFIFOREST(fd) < 30)
 				return 0;
-			id=RFIFOL(fd,2);
-			if (id == -1) {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Echec � la cr饌tion du compte [%s]. Un compte identique existe d駛�.\n", RFIFOP(fd,6));
-					ladmin_log("Echec � la cr饌tion du compte [%s]. Un compte identique existe d駛�.\n", RFIFOP(fd,6));
-				} else {
-					ShowMessage("Account [%s] creation failed. Same account already exists.\n", RFIFOP(fd,6));
-					ladmin_log("Account [%s] creation failed. Same account already exists.\n", RFIFOP(fd,6));
-				}
+			id = RFIFOL(fd,2);
+			if (id != -1) {
+				ShowMessage("Account [%s] creation failed. Return code %d.\n", RFIFOP(fd,6), id);
+				ladmin_log("Account [%s] creation failed. Return code %d.\n", RFIFOP(fd,6), id);
 			} else {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Compte [%s] cr鳬 avec succ鑚 [id: %d].\n", RFIFOP(fd,6), id);
-					ladmin_log("Compte [%s] cr鳬 avec succ鑚 [id: %d].\n", RFIFOP(fd,6), id);
-				} else {
-					ShowMessage("Account [%s] is successfully created [id: %d].\n", RFIFOP(fd,6), id);
-					ladmin_log("Account [%s] is successfully created [id: %d].\n", RFIFOP(fd,6), id);
-				}
+				ShowMessage("Account [%s] is successfully created.\n", RFIFOP(fd,6));
+				ladmin_log("Account [%s] is successfully created.\n", RFIFOP(fd,6));
 			}
 			bytes_to_read = 0;
 			RFIFOSKIP(fd,30);
@@ -3499,21 +2490,11 @@ int parse_fromlogin(int fd)
 			if (RFIFOREST(fd) < 30)
 				return 0;
 			if (RFIFOL(fd,2) == -1) {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Echec de la suppression du compte [%s]. Le compte n'existe pas.\n", RFIFOP(fd,6));
-					ladmin_log("Echec de la suppression du compte [%s]. Le compte n'existe pas.\n", RFIFOP(fd,6));
-				} else {
-					ShowMessage("Account [%s] deletion failed. Account doesn't exist.\n", RFIFOP(fd,6));
-					ladmin_log("Account [%s] deletion failed. Account doesn't exist.\n", RFIFOP(fd,6));
-				}
+				ShowMessage("Account [%s] deletion failed. Account doesn't exist.\n", RFIFOP(fd,6));
+				ladmin_log("Account [%s] deletion failed. Account doesn't exist.\n", RFIFOP(fd,6));
 			} else {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Compte [%s][id: %d] SUPPRIME avec succ鑚.\n", RFIFOP(fd,6), (int)RFIFOL(fd,2));
-					ladmin_log("Compte [%s][id: %d] SUPPRIME avec succ鑚.\n", RFIFOP(fd,6), RFIFOL(fd,2));
-				} else {
-					ShowMessage("Account [%s][id: %d] is successfully DELETED.\n", RFIFOP(fd,6), (int)RFIFOL(fd,2));
-					ladmin_log("Account [%s][id: %d] is successfully DELETED.\n", RFIFOP(fd,6), RFIFOL(fd,2));
-				}
+				ShowMessage("Account [%s][id: %d] is successfully DELETED.\n", RFIFOP(fd,6), (int)RFIFOL(fd,2));
+				ladmin_log("Account [%s][id: %d] is successfully DELETED.\n", RFIFOP(fd,6), RFIFOL(fd,2));
 			}
 			bytes_to_read = 0;
 			RFIFOSKIP(fd,30);
@@ -3523,23 +2504,12 @@ int parse_fromlogin(int fd)
 			if (RFIFOREST(fd) < 30)
 				return 0;
 			if (RFIFOL(fd,2) == -1) {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Echec de la modification du mot de passe du compte [%s].\n", RFIFOP(fd,6));
-					ShowMessage("Le compte [%s] n'existe pas.\n", RFIFOP(fd,6));
-					ladmin_log("Echec de la modification du mot de passe du compte. Le compte [%s] n'existe pas.\n", RFIFOP(fd,6));
-				} else {
-					ShowMessage("Account [%s] password changing failed.\n", RFIFOP(fd,6));
-					ShowMessage("Account [%s] doesn't exist.\n", RFIFOP(fd,6));
-					ladmin_log("Account password changing failed. The compte [%s] doesn't exist.\n", RFIFOP(fd,6));
-				}
+				ShowMessage("Account [%s] password changing failed.\n", RFIFOP(fd,6));
+				ShowMessage("Account [%s] doesn't exist.\n", RFIFOP(fd,6));
+				ladmin_log("Account password changing failed. The compte [%s] doesn't exist.\n", RFIFOP(fd,6));
 			} else {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Modification du mot de passe du compte [%s][id: %d] r騏ssie.\n", RFIFOP(fd,6), (int)RFIFOL(fd,2));
-					ladmin_log("Modification du mot de passe du compte [%s][id: %d] r騏ssie.\n", RFIFOP(fd,6), (int)RFIFOL(fd,2));
-				} else {
-					ShowMessage("Account [%s][id: %d] password successfully changed.\n", RFIFOP(fd,6), (int)RFIFOL(fd,2));
-					ladmin_log("Account [%s][id: %d] password successfully changed.\n", RFIFOP(fd,6), (int)RFIFOL(fd,2));
-				}
+				ShowMessage("Account [%s][id: %d] password successfully changed.\n", RFIFOP(fd,6), (int)RFIFOL(fd,2));
+				ladmin_log("Account [%s][id: %d] password successfully changed.\n", RFIFOP(fd,6), (int)RFIFOL(fd,2));
 			}
 			bytes_to_read = 0;
 			RFIFOSKIP(fd,30);
@@ -3549,27 +2519,14 @@ int parse_fromlogin(int fd)
 			if (RFIFOREST(fd) < 34)
 				return 0;
 			if (RFIFOL(fd,2) == -1) {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Echec du changement du statut du compte [%s]. Le compte n'existe pas.\n", RFIFOP(fd,6));
-					ladmin_log("Echec du changement du statut du compte [%s]. Le compte n'existe pas.\n", RFIFOP(fd,6));
-				} else {
-					ShowMessage("Account [%s] state changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
-					ladmin_log("Account [%s] state changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
-				}
+				ShowMessage("Account [%s] state changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
+				ladmin_log("Account [%s] state changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
 			} else {
 				char tmpstr[256];
-				if (defaultlanguage == 'F') {
-					sprintf(tmpstr, "Statut du compte [%s] chang� avec succ鑚 en [", RFIFOP(fd,6));
-				} else {
-					sprintf(tmpstr, "Account [%s] state successfully changed in [", RFIFOP(fd,6));
-				}
+				sprintf(tmpstr, "Account [%s] state successfully changed in [", RFIFOP(fd,6));
 				switch(RFIFOL(fd,30)) {
 				case 0:
-					if (defaultlanguage == 'F')
-						strcat(tmpstr, "0: Compte Ok");
-					else
-						strcat(tmpstr, "0: Account OK");
-					break;
+					strcat(tmpstr, "0: Account OK");
 				case 1:
 					strcat(tmpstr, "1: Unregistered ID");
 					break;
@@ -3616,24 +2573,12 @@ int parse_fromlogin(int fd)
 			// Get length of the received packet
 			int i;
 			char name[20];
-			if (defaultlanguage == 'F') {
-				ladmin_log("  R馗eption du nombre de joueurs en ligne.\n");
-			} else {
-				ladmin_log("  Receiving of the number of online players.\n");
-			}
+			ladmin_log("  Receiving of the number of online players.\n");
 			// Read information of the servers
 			if (RFIFOW(fd,2) < 5) {
-				if (defaultlanguage == 'F') {
-					ShowMessage("  Aucun serveur n'est connect� au login serveur.\n");
-				} else {
-					ShowMessage("  No server is connected to the login-server.\n");
-				}
+				ShowMessage("  No server is connected to the login-server.\n");
 			} else {
-				if (defaultlanguage == 'F') {
-					ShowMessage("  Nombre de joueurs en ligne (serveur: nb):\n");
-				} else {
-					ShowMessage("  Number of online players (server: number).\n");
-				}
+				ShowMessage("  Number of online players (server: number).\n");
 				// Displaying of result
 				for(i = 4; i < RFIFOW(fd,2); i += 32) {
 					memcpy(name, RFIFOP(fd,i+6), sizeof(name));
@@ -3651,21 +2596,11 @@ int parse_fromlogin(int fd)
 				return 0;
 			id = RFIFOL(fd,2);
 			if (id == -1) {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Le compte [%s] n'existe pas ou le mot de passe est incorrect.\n", RFIFOP(fd,6));
-					ladmin_log("Le compte [%s] n'existe pas ou le mot de passe est incorrect.\n", RFIFOP(fd,6));
-				} else {
-					ShowMessage("The account [%s] doesn't exist or the password is incorrect.\n", RFIFOP(fd,6));
-					ladmin_log("The account [%s] doesn't exist or the password is incorrect.\n", RFIFOP(fd,6));
-				}
+				ShowMessage("The account [%s] doesn't exist or the password is incorrect.\n", RFIFOP(fd,6));
+				ladmin_log("The account [%s] doesn't exist or the password is incorrect.\n", RFIFOP(fd,6));
 			} else {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Le mot de passe donn� correspond bien au compte [%s][id: %d].\n", RFIFOP(fd,6), id);
-					ladmin_log("Le mot de passe donn� correspond bien au compte [%s][id: %d].\n", RFIFOP(fd,6), id);
-				} else {
-					ShowMessage("The proposed password is correct for the account [%s][id: %d].\n", RFIFOP(fd,6), id);
-					ladmin_log("The proposed password is correct for the account [%s][id: %d].\n", RFIFOP(fd,6), id);
-				}
+				ShowMessage("The proposed password is correct for the account [%s][id: %d].\n", RFIFOP(fd,6), id);
+				ladmin_log("The proposed password is correct for the account [%s][id: %d].\n", RFIFOP(fd,6), id);
 			}
 			bytes_to_read = 0;
 			RFIFOSKIP(fd,30);
@@ -3676,23 +2611,12 @@ int parse_fromlogin(int fd)
 				return 0;
 			id = RFIFOL(fd,2);
 			if (id == -1) {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Echec de la modification du sexe du compte [%s].\n", RFIFOP(fd,6));
-					ShowMessage("Le compte [%s] n'existe pas ou le sexe est d駛� celui demand�.\n", RFIFOP(fd,6));
-					ladmin_log("Echec de la modification du sexe du compte. Le compte [%s] n'existe pas ou le sexe est d駛� celui demand�.\n", RFIFOP(fd,6));
-				} else {
-					ShowMessage("Account [%s] sex changing failed.\n", RFIFOP(fd,6));
-					ShowMessage("Account [%s] doesn't exist or the sex is already the good sex.\n", RFIFOP(fd,6));
-					ladmin_log("Account sex changing failed. The compte [%s] doesn't exist or the sex is already the good sex.\n", RFIFOP(fd,6));
-				}
+				ShowMessage("Account [%s] sex changing failed.\n", RFIFOP(fd,6));
+				ShowMessage("Account [%s] doesn't exist or the sex is already the good sex.\n", RFIFOP(fd,6));
+				ladmin_log("Account sex changing failed. The compte [%s] doesn't exist or the sex is already the good sex.\n", RFIFOP(fd,6));
 			} else {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Sexe du compte [%s][id: %d] chang� avec succ鑚.\n", RFIFOP(fd,6), id);
-					ladmin_log("Sexe du compte [%s][id: %d] chang� avec succ鑚.\n", RFIFOP(fd,6), id);
-				} else {
-					ShowMessage("Account [%s][id: %d] sex successfully changed.\n", RFIFOP(fd,6), id);
-					ladmin_log("Account [%s][id: %d] sex successfully changed.\n", RFIFOP(fd,6), id);
-				}
+				ShowMessage("Account [%s][id: %d] sex successfully changed.\n", RFIFOP(fd,6), id);
+				ladmin_log("Account [%s][id: %d] sex successfully changed.\n", RFIFOP(fd,6), id);
 			}
 			bytes_to_read = 0;
 			RFIFOSKIP(fd,30);
@@ -3703,25 +2627,13 @@ int parse_fromlogin(int fd)
 				return 0;
 			id = RFIFOL(fd,2);
 			if (id == -1) {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Echec de la modification du niveau de GM du compte [%s].\n", RFIFOP(fd,6));
-					ShowMessage("Le compte [%s] n'existe pas, le niveau de GM est d駛� celui demand饅n", RFIFOP(fd,6));
-					ShowMessage("ou il est impossible de modifier le fichier des comptes GM.\n");
-					ladmin_log("Echec de la modification du niveau de GM du compte. Le compte [%s] n'existe pas, le niveau de GM est d駛� celui demand� ou il est impossible de modifier le fichier des comptes GM.\n", RFIFOP(fd,6));
-				} else {
-					ShowMessage("Account [%s] GM level changing failed.\n", RFIFOP(fd,6));
-					ShowMessage("Account [%s] doesn't exist, the GM level is already the good GM level\n", RFIFOP(fd,6));
-					ShowMessage("or it's impossible to modify the GM accounts file.\n");
-					ladmin_log("Account GM level changing failed. The compte [%s] doesn't exist, the GM level is already the good sex or it's impossible to modify the GM accounts file.\n", RFIFOP(fd,6));
-				}
+				ShowMessage("Account [%s] GM level changing failed.\n", RFIFOP(fd,6));
+				ShowMessage("Account [%s] doesn't exist, the GM level is already the good GM level\n", RFIFOP(fd,6));
+				ShowMessage("or it's impossible to modify the GM accounts file.\n");
+				ladmin_log("Account GM level changing failed. The compte [%s] doesn't exist, the GM level is already the good sex or it's impossible to modify the GM accounts file.\n", RFIFOP(fd,6));
 			} else {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Niveau de GM du compte [%s][id: %d] chang� avec succ鑚.\n", RFIFOP(fd,6), id);
-					ladmin_log("Niveau de GM du compte [%s][id: %d] chang� avec succ鑚.\n", RFIFOP(fd,6), id);
-				} else {
-					ShowMessage("Account [%s][id: %d] GM level successfully changed.\n", RFIFOP(fd,6), id);
-					ladmin_log("Account [%s][id: %d] GM level successfully changed.\n", RFIFOP(fd,6), id);
-				}
+				ShowMessage("Account [%s][id: %d] GM level successfully changed.\n", RFIFOP(fd,6), id);
+				ladmin_log("Account [%s][id: %d] GM level successfully changed.\n", RFIFOP(fd,6), id);
 			}
 			bytes_to_read = 0;
 			RFIFOSKIP(fd,30);
@@ -3732,23 +2644,12 @@ int parse_fromlogin(int fd)
 				return 0;
 			id = RFIFOL(fd,2);
 			if (id == -1) {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Echec de la modification de l'e-mail du compte [%s].\n", RFIFOP(fd,6));
-					ShowMessage("Le compte [%s] n'existe pas.\n", RFIFOP(fd,6));
-					ladmin_log("Echec de la modification de l'e-mail du compte. Le compte [%s] n'existe pas.\n", RFIFOP(fd,6));
-				} else {
-					ShowMessage("Account [%s] e-mail changing failed.\n", RFIFOP(fd,6));
-					ShowMessage("Account [%s] doesn't exist.\n", RFIFOP(fd,6));
-					ladmin_log("Account e-mail changing failed. The compte [%s] doesn't exist.\n", RFIFOP(fd,6));
-				}
+				ShowMessage("Account [%s] e-mail changing failed.\n", RFIFOP(fd,6));
+				ShowMessage("Account [%s] doesn't exist.\n", RFIFOP(fd,6));
+				ladmin_log("Account e-mail changing failed. The compte [%s] doesn't exist.\n", RFIFOP(fd,6));
 			} else {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Modification de l'e-mail du compte [%s][id: %d] r騏ssie.\n", RFIFOP(fd,6), id);
-					ladmin_log("Modification de l'e-mail du compte [%s][id: %d] r騏ssie.\n", RFIFOP(fd,6), id);
-				} else {
-					ShowMessage("Account [%s][id: %d] e-mail successfully changed.\n", RFIFOP(fd,6), id);
-					ladmin_log("Account [%s][id: %d] e-mail successfully changed.\n", RFIFOP(fd,6), id);
-				}
+				ShowMessage("Account [%s][id: %d] e-mail successfully changed.\n", RFIFOP(fd,6), id);
+				ladmin_log("Account [%s][id: %d] e-mail successfully changed.\n", RFIFOP(fd,6), id);
 			}
 			bytes_to_read = 0;
 			RFIFOSKIP(fd,30);
@@ -3759,21 +2660,11 @@ int parse_fromlogin(int fd)
 				return 0;
 			id = RFIFOL(fd,2);
 			if (id == -1) {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Echec du changement du m駑o du compte [%s]. Le compte n'existe pas.\n", RFIFOP(fd,6));
-					ladmin_log("Echec du changement du m駑o du compte [%s]. Le compte n'existe pas.\n", RFIFOP(fd,6));
-				} else {
-					ShowMessage("Account [%s] memo changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
-					ladmin_log("Account [%s] memo changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
-				}
+				ShowMessage("Account [%s] memo changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
+				ladmin_log("Account [%s] memo changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
 			} else {
-				if (defaultlanguage == 'F') {
-					ShowMessage("M駑o du compte [%s][id: %d] chang� avec succ鑚.\n", RFIFOP(fd,6), id);
-					ladmin_log("M駑o du compte [%s][id: %d] chang� avec succ鑚.\n", RFIFOP(fd,6), id);
-				} else {
-					ShowMessage("Account [%s][id: %d] memo successfully changed.\n", RFIFOP(fd,6), id);
-					ladmin_log("Account [%s][id: %d] memo successfully changed.\n", RFIFOP(fd,6), id);
-				}
+				ShowMessage("Account [%s][id: %d] memo successfully changed.\n", RFIFOP(fd,6), id);
+				ladmin_log("Account [%s][id: %d] memo successfully changed.\n", RFIFOP(fd,6), id);
 			}
 			bytes_to_read = 0;
 			RFIFOSKIP(fd,30);
@@ -3784,21 +2675,11 @@ int parse_fromlogin(int fd)
 				return 0;
 			id = RFIFOL(fd,2);
 			if (id == -1) {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Impossible de trouver l'id du compte [%s]. Le compte n'existe pas.\n", RFIFOP(fd,6));
-					ladmin_log("Impossible de trouver l'id du compte [%s]. Le compte n'existe pas.\n", RFIFOP(fd,6));
-				} else {
-					ShowMessage("Unable to find the account [%s] id. Account doesn't exist.\n", RFIFOP(fd,6));
-					ladmin_log("Unable to find the account [%s] id. Account doesn't exist.\n", RFIFOP(fd,6));
-				}
+				ShowMessage("Unable to find the account [%s] id. Account doesn't exist.\n", RFIFOP(fd,6));
+				ladmin_log("Unable to find the account [%s] id. Account doesn't exist.\n", RFIFOP(fd,6));
 			} else {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Le compte [%s] a pour id: %d.\n", RFIFOP(fd,6), id);
-					ladmin_log("Le compte [%s] a pour id: %d.\n", RFIFOP(fd,6), id);
-				} else {
-					ShowMessage("The account [%s] have the id: %d.\n", RFIFOP(fd,6), id);
-					ladmin_log("The account [%s] have the id: %d.\n", RFIFOP(fd,6), id);
-				}
+				ShowMessage("The account [%s] have the id: %d.\n", RFIFOP(fd,6), id);
+				ladmin_log("The account [%s] have the id: %d.\n", RFIFOP(fd,6), id);
 			}
 			bytes_to_read = 0;
 			RFIFOSKIP(fd,30);
@@ -3809,21 +2690,11 @@ int parse_fromlogin(int fd)
 				return 0;
 			id = RFIFOL(fd,2);
 			if (strcmp((const char*)RFIFOP(fd,6), "") == 0) {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Impossible de trouver le nom du compte [%d]. Le compte n'existe pas.\n", id);
-					ladmin_log("Impossible de trouver le nom du compte [%d]. Le compte n'existe pas.\n", id);
-				} else {
-					ShowMessage("Unable to find the account [%d] name. Account doesn't exist.\n", id);
-					ladmin_log("Unable to find the account [%d] name. Account doesn't exist.\n", id);
-				}
+				ShowMessage("Unable to find the account [%d] name. Account doesn't exist.\n", id);
+				ladmin_log("Unable to find the account [%d] name. Account doesn't exist.\n", id);
 			} else {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Le compte [id: %d] a pour nom: %s.\n", id, RFIFOP(fd,6));
-					ladmin_log("Le compte [id: %d] a pour nom: %s.\n", id, RFIFOP(fd,6));
-				} else {
-					ShowMessage("The account [id: %d] have the name: %s.\n", id, RFIFOP(fd,6));
-					ladmin_log("The account [id: %d] have the name: %s.\n", id, RFIFOP(fd,6));
-				}
+				ShowMessage("The account [id: %d] have the name: %s.\n", id, RFIFOP(fd,6));
+				ladmin_log("The account [id: %d] have the name: %s.\n", id, RFIFOP(fd,6));
 			}
 			bytes_to_read = 0;
 			RFIFOSKIP(fd,30);
@@ -3834,33 +2705,18 @@ int parse_fromlogin(int fd)
 				return 0;
 			id = RFIFOL(fd,2);
 			if (id == -1) {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Echec du changement de la validit� du compte [%s]. Le compte n'existe pas.\n", RFIFOP(fd,6));
-					ladmin_log("Echec du changement de la validit� du compte [%s]. Le compte n'existe pas.\n", RFIFOP(fd,6));
-				} else {
-					ShowMessage("Account [%s] validity limit changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
-					ladmin_log("Account [%s] validity limit changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
-				}
+				ShowMessage("Account [%s] validity limit changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
+				ladmin_log("Account [%s] validity limit changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
 			} else {
 				time_t timestamp = RFIFOL(fd,30);
 				if (timestamp == 0) {
-					if (defaultlanguage == 'F') {
-						ShowMessage("Limite de validit� du compte [%s][id: %d] chang馥 avec succ鑚 en [illimit饐.\n", RFIFOP(fd,6), id);
-						ladmin_log("Limite de validit� du compte [%s][id: %d] chang馥 avec succ鑚 en [illimit饐.\n", RFIFOP(fd,6), id);
-					} else {
-						ShowMessage("Validity Limit of the account [%s][id: %d] successfully changed to [unlimited].\n", RFIFOP(fd,6), id);
-						ladmin_log("Validity Limit of the account [%s][id: %d] successfully changed to [unlimited].\n", RFIFOP(fd,6), id);
-					}
+					ShowMessage("Validity Limit of the account [%s][id: %d] successfully changed to [unlimited].\n", RFIFOP(fd,6), id);
+					ladmin_log("Validity Limit of the account [%s][id: %d] successfully changed to [unlimited].\n", RFIFOP(fd,6), id);
 				} else {
 					char tmpstr[128];
 					strftime(tmpstr, 24, date_format, localtime(&timestamp));
-					if (defaultlanguage == 'F') {
-						ShowMessage("Limite de validit� du compte [%s][id: %d] chang馥 avec succ鑚 pour 黎re jusqu'au %s.\n", RFIFOP(fd,6), id, tmpstr);
-						ladmin_log("Limite de validit� du compte [%s][id: %d] chang馥 avec succ鑚 pour 黎re jusqu'au %s.\n", RFIFOP(fd,6), id, tmpstr);
-					} else {
-						ShowMessage("Validity Limit of the account [%s][id: %d] successfully changed to be until %s.\n", RFIFOP(fd,6), id, tmpstr);
-						ladmin_log("Validity Limit of the account [%s][id: %d] successfully changed to be until %s.\n", RFIFOP(fd,6), id, tmpstr);
-					}
+					ShowMessage("Validity Limit of the account [%s][id: %d] successfully changed to be until %s.\n", RFIFOP(fd,6), id, tmpstr);
+					ladmin_log("Validity Limit of the account [%s][id: %d] successfully changed to be until %s.\n", RFIFOP(fd,6), id, tmpstr);
 				}
 			}
 			bytes_to_read = 0;
@@ -3872,33 +2728,18 @@ int parse_fromlogin(int fd)
 				return 0;
 			id = RFIFOL(fd,2);
 			if (id == -1) {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Echec du changement de la date finale de banissement du compte [%s]. Le compte n'existe pas.\n", RFIFOP(fd,6));
-					ladmin_log("Echec du changement de la date finale de banissement du compte [%s]. Le compte n'existe pas.\n", RFIFOP(fd,6));
-				} else {
-					ShowMessage("Account [%s] final date of banishment changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
-					ladmin_log("Account [%s] final date of banishment changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
-				}
+				ShowMessage("Account [%s] final date of banishment changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
+				ladmin_log("Account [%s] final date of banishment changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
 			} else {
 				time_t timestamp = RFIFOL(fd,30);
 				if (timestamp == 0) {
-					if (defaultlanguage == 'F') {
-						ShowMessage("Date finale de banissement du compte [%s][id: %d] chang馥 avec succ鑚 en [d�-bannie].\n", RFIFOP(fd,6), id);
-						ladmin_log("Date finale de banissement du compte [%s][id: %d] chang馥 avec succ鑚 en [d�-bannie].\n", RFIFOP(fd,6), id);
-					} else {
-						ShowMessage("Final date of banishment of the account [%s][id: %d] successfully changed to [unbanished].\n", RFIFOP(fd,6), id);
-						ladmin_log("Final date of banishment of the account [%s][id: %d] successfully changed to [unbanished].\n", RFIFOP(fd,6), id);
-					}
+					ShowMessage("Final date of banishment of the account [%s][id: %d] successfully changed to [unbanished].\n", RFIFOP(fd,6), id);
+					ladmin_log("Final date of banishment of the account [%s][id: %d] successfully changed to [unbanished].\n", RFIFOP(fd,6), id);
 				} else {
 					char tmpstr[128];
 					strftime(tmpstr, 24, date_format, localtime(&timestamp));
-					if (defaultlanguage == 'F') {
-						ShowMessage("Date finale de banissement du compte [%s][id: %d] chang馥 avec succ鑚 pour 黎re jusqu'au %s.\n", RFIFOP(fd,6), id, tmpstr);
-						ladmin_log("Date finale de banissement du compte [%s][id: %d] chang馥 avec succ鑚 pour 黎re jusqu'au %s.\n", RFIFOP(fd,6), id, tmpstr);
-					} else {
-						ShowMessage("Final date of banishment of the account [%s][id: %d] successfully changed to be until %s.\n", RFIFOP(fd,6), id, tmpstr);
-						ladmin_log("Final date of banishment of the account [%s][id: %d] successfully changed to be until %s.\n", RFIFOP(fd,6), id, tmpstr);
-					}
+					ShowMessage("Final date of banishment of the account [%s][id: %d] successfully changed to be until %s.\n", RFIFOP(fd,6), id, tmpstr);
+					ladmin_log("Final date of banishment of the account [%s][id: %d] successfully changed to be until %s.\n", RFIFOP(fd,6), id, tmpstr);
 				}
 			}
 			bytes_to_read = 0;
@@ -3910,33 +2751,18 @@ int parse_fromlogin(int fd)
 				return 0;
 			id = RFIFOL(fd,2);
 			if (id == -1) {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Echec du changement de la date finale de banissement du compte [%s]. Le compte n'existe pas.\n", RFIFOP(fd,6));
-					ladmin_log("Echec du changement de la date finale de banissement du compte [%s]. Le compte n'existe pas.\n", RFIFOP(fd,6));
-				} else {
-					ShowMessage("Account [%s] final date of banishment changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
-					ladmin_log("Account [%s] final date of banishment changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
-				}
+				ShowMessage("Account [%s] final date of banishment changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
+				ladmin_log("Account [%s] final date of banishment changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
 			} else {
 				time_t timestamp = RFIFOL(fd,30);
 				if (timestamp == 0) {
-					if (defaultlanguage == 'F') {
-						ShowMessage("Date finale de banissement du compte [%s][id: %d] chang馥 avec succ鑚 en [d�-bannie].\n", RFIFOP(fd,6), id);
-						ladmin_log("Date finale de banissement du compte [%s][id: %d] chang馥 avec succ鑚 en [d�-bannie].\n", RFIFOP(fd,6), id);
-					} else {
-						ShowMessage("Final date of banishment of the account [%s][id: %d] successfully changed to [unbanished].\n", RFIFOP(fd,6), id);
-						ladmin_log("Final date of banishment of the account [%s][id: %d] successfully changed to [unbanished].\n", RFIFOP(fd,6), id);
-					}
+					ShowMessage("Final date of banishment of the account [%s][id: %d] successfully changed to [unbanished].\n", RFIFOP(fd,6), id);
+					ladmin_log("Final date of banishment of the account [%s][id: %d] successfully changed to [unbanished].\n", RFIFOP(fd,6), id);
 				} else {
 					char tmpstr[128];
 					strftime(tmpstr, 24, date_format, localtime(&timestamp));
-					if (defaultlanguage == 'F') {
-						ShowMessage("Date finale de banissement du compte [%s][id: %d] chang馥 avec succ鑚 pour 黎re jusqu'au %s.\n", RFIFOP(fd,6), id, tmpstr);
-						ladmin_log("Date finale de banissement du compte [%s][id: %d] chang馥 avec succ鑚 pour 黎re jusqu'au %s.\n", RFIFOP(fd,6), id, tmpstr);
-					} else {
-						ShowMessage("Final date of banishment of the account [%s][id: %d] successfully changed to be until %s.\n", RFIFOP(fd,6), id, tmpstr);
-						ladmin_log("Final date of banishment of the account [%s][id: %d] successfully changed to be until %s.\n", RFIFOP(fd,6), id, tmpstr);
-					}
+					ShowMessage("Final date of banishment of the account [%s][id: %d] successfully changed to be until %s.\n", RFIFOP(fd,6), id, tmpstr);
+					ladmin_log("Final date of banishment of the account [%s][id: %d] successfully changed to be until %s.\n", RFIFOP(fd,6), id, tmpstr);
 				}
 			}
 			bytes_to_read = 0;
@@ -3947,21 +2773,11 @@ int parse_fromlogin(int fd)
 			if (RFIFOREST(fd) < 4)
 				return 0;
 			if (RFIFOW(fd,2) == (unsigned short)-1) {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Echec de l'envoi du message. Aucun server de char en ligne.\n");
-					ladmin_log("Echec de l'envoi du message. Aucun server de char en ligne.\n");
-				} else {
-					ShowMessage("Message sending failed. No online char-server.\n");
-					ladmin_log("Message sending failed. No online char-server.\n");
-				}
+				ShowMessage("Message sending failed. No online char-server.\n");
+				ladmin_log("Message sending failed. No online char-server.\n");
 			} else {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Message transmis au server de logins avec succ鑚.\n");
-					ladmin_log("Message transmis au server de logins avec succ鑚.\n");
-				} else {
-					ShowMessage("Message successfully sended to login-server.\n");
-					ladmin_log("Message successfully sended to login-server.\n");
-				}
+				ShowMessage("Message successfully sended to login-server.\n");
+				ladmin_log("Message successfully sended to login-server.\n");
 			}
 			bytes_to_read = 0;
 			RFIFOSKIP(fd,4);
@@ -3972,37 +2788,20 @@ int parse_fromlogin(int fd)
 				return 0;
 			id = RFIFOL(fd,2);
 			if (id == -1) {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Echec du changement de la validit� du compte [%s]. Le compte n'existe pas.\n", RFIFOP(fd,6));
-					ladmin_log("Echec du changement de la validit� du compte [%s]. Le compte n'existe pas.\n", RFIFOP(fd,6));
-				} else {
-					ShowMessage("Account [%s] validity limit changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
-					ladmin_log("Account [%s] validity limit changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
-				}
+				ShowMessage("Account [%s] validity limit changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
+				ladmin_log("Account [%s] validity limit changing failed. Account doesn't exist.\n", RFIFOP(fd,6));
 			} else {
 				time_t timestamp = RFIFOL(fd,30);
 				if (timestamp == 0) {
-					if (defaultlanguage == 'F') {
-						ShowMessage("Limite de validit� du compte [%s][id: %d] inchang馥.\n", RFIFOP(fd,6), id);
-						ShowMessage("Le compte a une validit� illimit馥 ou\n");
-						ShowMessage("la modification est impossible avec les ajustements demand駸.\n");
-						ladmin_log("Limite de validit� du compte [%s][id: %d] inchang馥. Le compte a une validit� illimit馥 ou la modification est impossible avec les ajustements demand駸.\n", RFIFOP(fd,6), id);
-					} else {
-						ShowMessage("Validity limit of the account [%s][id: %d] unchanged.\n", RFIFOP(fd,6), id);
-						ShowMessage("The account have an unlimited validity limit or\n");
-						ShowMessage("the changing is impossible with the proposed adjustments.\n");
-						ladmin_log("Validity limit of the account [%s][id: %d] unchanged. The account have an unlimited validity limit or the changing is impossible with the proposed adjustments.\n", RFIFOP(fd,6), id);
-					}
+					ShowMessage("Validity limit of the account [%s][id: %d] unchanged.\n", RFIFOP(fd,6), id);
+					ShowMessage("The account have an unlimited validity limit or\n");
+					ShowMessage("the changing is impossible with the proposed adjustments.\n");
+					ladmin_log("Validity limit of the account [%s][id: %d] unchanged. The account have an unlimited validity limit or the changing is impossible with the proposed adjustments.\n", RFIFOP(fd,6), id);
 				} else {
 					char tmpstr[128];
 					strftime(tmpstr, 24, date_format, localtime(&timestamp));
-					if (defaultlanguage == 'F') {
-						ShowMessage("Limite de validit� du compte [%s][id: %d] chang馥 avec succ鑚 pour 黎re jusqu'au %s.\n", RFIFOP(fd,6), id, tmpstr);
-						ladmin_log("Limite de validit� du compte [%s][id: %d] chang馥 avec succ鑚 pour 黎re jusqu'au %s.\n", RFIFOP(fd,6), id, tmpstr);
-					} else {
-						ShowMessage("Validity limit of the account [%s][id: %d] successfully changed to be until %s.\n", RFIFOP(fd,6), id, tmpstr);
-						ladmin_log("Validity limit of the account [%s][id: %d] successfully changed to be until %s.\n", RFIFOP(fd,6), id, tmpstr);
-					}
+					ShowMessage("Validity limit of the account [%s][id: %d] successfully changed to be until %s.\n", RFIFOP(fd,6), id, tmpstr);
+					ladmin_log("Validity limit of the account [%s][id: %d] successfully changed to be until %s.\n", RFIFOP(fd,6), id, tmpstr);
 				}
 			}
 			bytes_to_read = 0;
@@ -4012,154 +2811,75 @@ int parse_fromlogin(int fd)
 		case 0x7953:	// answer of a request about informations of an account (by account name/id)
 			if (RFIFOREST(fd) < 150 || RFIFOREST(fd) < (size_t)(150 + RFIFOW(fd,148)))
 				return 0;
-		  {
+		{
 			char userid[24], error_message[20], lastlogin[24], last_ip[16], email[40], memo[255];
 			time_t unban_time; // # of seconds 1/1/1970 (timestamp): ban time limit of the account (0 = no ban)
 			time_t expiration_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited)
-			memcpy(userid, RFIFOP(fd,7), sizeof(userid));
-			userid[sizeof(userid)-1] = '\0';
-			memcpy(error_message, RFIFOP(fd,40), sizeof(error_message));
-			error_message[sizeof(error_message)-1] = '\0';
-			memcpy(lastlogin, RFIFOP(fd,60), sizeof(lastlogin));
-			lastlogin[sizeof(lastlogin)-1] = '\0';
-			memcpy(last_ip, RFIFOP(fd,84), sizeof(last_ip));
-			last_ip[sizeof(last_ip)-1] = '\0';
-			memcpy(email, RFIFOP(fd,100), sizeof(email));
-			email[sizeof(email)-1] = '\0';
+			safestrncpy(userid, (char*)RFIFOP(fd,7), sizeof(userid));
+			safestrncpy(error_message, (char*)RFIFOP(fd,40), sizeof(error_message));
+			safestrncpy(lastlogin, (char*)RFIFOP(fd,60), sizeof(lastlogin));
+			safestrncpy(last_ip, (char*)RFIFOP(fd,84), sizeof(last_ip));
+			safestrncpy(email, (char*)RFIFOP(fd,100), sizeof(email));
 			expiration_time = (time_t)RFIFOL(fd,140);
 			unban_time = (time_t)RFIFOL(fd,144);
 			memset(memo, '\0', sizeof(memo));
-			strncpy(memo, (const char*)RFIFOP(fd,150), RFIFOW(fd,148));
+			safestrncpy(memo, (const char*)RFIFOP(fd,150), RFIFOW(fd,148));
 			id = RFIFOL(fd,2);
 			if (id == -1) {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Impossible de trouver le compte [%s]. Le compte n'existe pas.\n", parameters);
-					ladmin_log("Impossible de trouver le compte [%s]. Le compte n'existe pas.\n", parameters);
-				} else {
-					ShowMessage("Unabled to find the account [%s]. Account doesn't exist.\n", parameters);
-					ladmin_log("Unabled to find the account [%s]. Account doesn't exist.\n", parameters);
-				}
+				ShowMessage("Unabled to find the account [%s]. Account doesn't exist.\n", parameters);
+				ladmin_log("Unabled to find the account [%s]. Account doesn't exist.\n", parameters);
 			} else if (strlen(userid) == 0) {
-				if (defaultlanguage == 'F') {
-					ShowMessage("Impossible de trouver le compte [id: %s]. Le compte n'existe pas.\n", parameters);
-					ladmin_log("Impossible de trouver le compte [id: %s]. Le compte n'existe pas.\n", parameters);
-				} else {
-					ShowMessage("Unabled to find the account [id: %s]. Account doesn't exist.\n", parameters);
-					ladmin_log("Unabled to find the account [id: %s]. Account doesn't exist.\n", parameters);
-				}
+				ShowMessage("Unabled to find the account [id: %s]. Account doesn't exist.\n", parameters);
+				ladmin_log("Unabled to find the account [id: %s]. Account doesn't exist.\n", parameters);
 			} else {
-				if (defaultlanguage == 'F') {
-					ladmin_log("R馗eption d'information concernant un compte.\n");
-					ShowMessage("Le compte a les caract駻istiques suivantes:\n");
-				} else {
-					ladmin_log("Receiving information about an account.\n");
-					ShowMessage("The account is set with:\n");
-				}
+				ladmin_log("Receiving information about an account.\n");
+				ShowMessage("The account is set with:\n");
 				if (RFIFOB(fd,6) == 0) {
 					ShowMessage(" Id:     %d (non-GM)\n", id);
 				} else {
-					if (defaultlanguage == 'F') {
-						ShowMessage(" Id:     %d (GM niveau %d)\n", id, (int)RFIFOB(fd,6));
-					} else {
-						ShowMessage(" Id:     %d (GM level %d)\n", id, (int)RFIFOB(fd,6));
-					}
-				}
-				if (defaultlanguage == 'F') {
-					ShowMessage(" Nom:    '%s'\n", userid);
-					if (RFIFOB(fd,31) == 0)
-						ShowMessage(" Sexe:   Femme\n");
-					else if (RFIFOB(fd,31) == 1)
-						ShowMessage(" Sexe:   Male\n");
-					else
-						ShowMessage(" Sexe:   Serveur\n");
-				} else {
-					ShowMessage(" Name:   '%s'\n", userid);
-					if (RFIFOB(fd,31) == 0)
-						ShowMessage(" Sex:    Female\n");
-					else if (RFIFOB(fd,31) == 1)
-						ShowMessage(" Sex:    Male\n");
-					else
-						ShowMessage(" Sex:    Server\n");
+					ShowMessage(" Id:     %d (GM level %d)\n", id, (int)RFIFOB(fd,6));
 				}
+				ShowMessage(" Name:   '%s'\n", userid);
+				if (RFIFOB(fd,31) == 0)
+					ShowMessage(" Sex:    Female\n");
+				else if (RFIFOB(fd,31) == 1)
+					ShowMessage(" Sex:    Male\n");
+				else
+					ShowMessage(" Sex:    Server\n");
 				ShowMessage(" E-mail: %s\n", email);
 				switch(RFIFOL(fd,36)) {
-				case 0:
-					if (defaultlanguage == 'F')
-						ShowMessage(" Statut: 0 [Compte Ok]\n");
-					else
-						ShowMessage(" State: 0 [Account OK]\n");
-					break;
-				case 1:
-					ShowMessage(" Statut: 1 [Unregistered ID]\n");
-					break;
-				case 2:
-					ShowMessage(" State: 2 [Incorrect Password]\n");
-					break;
-				case 3:
-					ShowMessage(" Statut: 3 [This ID is expired]\n");
-					break;
-				case 4:
-					ShowMessage(" State: 4 [Rejected from Server]\n");
-					break;
-				case 5:
-					ShowMessage(" Statut: 5 [You have been blocked by the GM Team]\n");
-					break;
-				case 6:
-					ShowMessage(" State: 6 [Your Game's EXE file is not the latest version]\n");
-					break;
-				case 7:
-					ShowMessage(" Statut: 7 [You are Prohibited to log in until %s]\n", error_message);
-					break;
-				case 8:
-					ShowMessage(" State: 8 [Server is jammed due to over populated]\n");
-					break;
-				case 9:
-					ShowMessage(" Statut: 9 [No MSG]\n");
-					break;
+				case 0: ShowMessage(" State: 0 [Account OK]\n"); break;
+				case 1: ShowMessage(" State: 1 [Unregistered ID]\n"); break;
+				case 2: ShowMessage(" State: 2 [Incorrect Password]\n"); break;
+				case 3: ShowMessage(" State: 3 [This ID is expired]\n"); break;
+				case 4: ShowMessage(" State: 4 [Rejected from Server]\n"); break;
+				case 5: ShowMessage(" State: 5 [You have been blocked by the GM Team]\n"); break;
+				case 6: ShowMessage(" State: 6 [Your Game's EXE file is not the latest version]\n"); break;
+				case 7: ShowMessage(" State: 7 [You are Prohibited to log in until %s]\n", error_message); break;
+				case 8: ShowMessage(" State: 8 [Server is jammed due to over populated]\n"); break;
+				case 9: ShowMessage(" State: 9 [No MSG]\n"); break;
 				default: // 100
 					ShowMessage(" State: %d [This ID is totally erased]\n", (int)RFIFOL(fd,36));
 					break;
 				}
-				if (defaultlanguage == 'F') {
-					if (unban_time == 0) {
-						ShowMessage(" Banissement: non banni.\n");
-					} else {
-						char tmpstr[128];
-						strftime(tmpstr, 24, date_format, localtime(&unban_time));
-						ShowMessage(" Banissement: jusqu'au %s.\n", tmpstr);
-					}
-					if (RFIFOL(fd,32) > 1)
-						ShowMessage(" Compteur: %d connexions.\n", (int)RFIFOL(fd,32));
-					else
-						ShowMessage(" Compteur: %d connexion.\n", (int)RFIFOL(fd,32));
-					ShowMessage(" Derni鑽e connexion le: %s (ip: %s)\n", lastlogin, last_ip);
-					if (expiration_time == 0) {
-						ShowMessage(" Limite de validit�: illimit�.\n");
-					} else {
-						char tmpstr[128];
-						strftime(tmpstr, 24, date_format, localtime(&expiration_time));
-						ShowMessage(" Limite de validit�: jusqu'au %s.\n", tmpstr);
-					}
+				if (unban_time == 0) {
+					ShowMessage(" Banishment: not banished.\n");
 				} else {
-					if (unban_time == 0) {
-						ShowMessage(" Banishment: not banished.\n");
-					} else {
-						char tmpstr[128];
-						strftime(tmpstr, 24, date_format, localtime(&unban_time));
-						ShowMessage(" Banishment: until %s.\n", tmpstr);
-					}
-					if (RFIFOL(fd,32) > 1)
-						ShowMessage(" Count:  %d connections.\n", (int)RFIFOL(fd,32));
-					else
-						ShowMessage(" Count:  %d connection.\n", (int)RFIFOL(fd,32));
-					ShowMessage(" Last connection at: %s (ip: %s)\n", lastlogin, last_ip);
-					if (expiration_time == 0) {
-						ShowMessage(" Validity limit: unlimited.\n");
-					} else {
-						char tmpstr[128];
-						strftime(tmpstr, 24, date_format, localtime(&expiration_time));
-						ShowMessage(" Validity limit: until %s.\n", tmpstr);
-					}
+					char tmpstr[128];
+					strftime(tmpstr, 24, date_format, localtime(&unban_time));
+					ShowMessage(" Banishment: until %s.\n", tmpstr);
+				}
+				if (RFIFOL(fd,32) > 1)
+					ShowMessage(" Count:  %d connections.\n", (int)RFIFOL(fd,32));
+				else
+					ShowMessage(" Count:  %d connection.\n", (int)RFIFOL(fd,32));
+				ShowMessage(" Last connection at: %s (ip: %s)\n", lastlogin, last_ip);
+				if (expiration_time == 0) {
+					ShowMessage(" Validity limit: unlimited.\n");
+				} else {
+					char tmpstr[128];
+					strftime(tmpstr, 24, date_format, localtime(&expiration_time));
+					ShowMessage(" Validity limit: until %s.\n", tmpstr);
 				}
 				ShowMessage(" Memo:   '%s'\n", memo);
 			}
@@ -4187,13 +2907,8 @@ int parse_fromlogin(int fd)
 //------------------------------------
 int Connect_login_server(void)
 {
-	if (defaultlanguage == 'F') {
-		ShowMessage("Essai de connection au server de logins...\n");
-		ladmin_log("Essai de connection au server de logins...\n");
-	} else {
-		ShowMessage("Attempt to connect to login-server...\n");
-		ladmin_log("Attempt to connect to login-server...\n");
-	}
+	ShowMessage("Attempt to connect to login-server...\n");
+	ladmin_log("Attempt to connect to login-server...\n");
 
 	login_fd = make_connection(login_ip, loginserverport);
 	if (login_fd == -1)
@@ -4209,25 +2924,15 @@ int Connect_login_server(void)
 		memcpy(WFIFOP(login_fd,4), loginserveradminpassword, 24);
 		WFIFOSET(login_fd,28);
 		bytes_to_read = 1;
-		if (defaultlanguage == 'F') {
-			ShowMessage("Envoi du mot de passe...\n");
-			ladmin_log("Envoi du mot de passe...\n");
-		} else {
-			ShowMessage("Sending of the password...\n");
-			ladmin_log("Sending of the password...\n");
-		}
+		ShowMessage("Sending of the password...\n");
+		ladmin_log("Sending of the password...\n");
 	} else {
 		WFIFOHEAD(login_fd,2);
 		WFIFOW(login_fd,0) = 0x791a; // Sending request about the coding key
 		WFIFOSET(login_fd,2);
 		bytes_to_read = 1;
-		if (defaultlanguage == 'F') {
-			ShowMessage("Demande de la clef MD5...\n");
-			ladmin_log("Demande de la clef MD5...\n");
-		} else {
-			ShowMessage("Request about the MD5 key...\n");
-			ladmin_log("Request about the MD5 key...\n");
-		}
+		ShowMessage("Request about the MD5 key...\n");
+		ladmin_log("Request about the MD5 key...\n");
 	}
 
 	return 0;
@@ -4255,19 +2960,11 @@ int ladmin_config_read(const char *cfgName)
 
 	fp = fopen(cfgName, "r");
 	if (fp == NULL) {
-		if (defaultlanguage == 'F') {
-			ShowMessage("\033[0mFichier de configuration (%s) non trouv�.\n", cfgName);
-		} else {
-			ShowMessage("\033[0mConfiguration file (%s) not found.\n", cfgName);
-		}
+		ShowMessage("\033[0mConfiguration file (%s) not found.\n", cfgName);
 		return 1;
 	}
 
-	if (defaultlanguage == 'F') {
-		ShowMessage("\033[0m---D饕ut de lecture du fichier de configuration Ladmin (%s)\n", cfgName);
-	} else {
-		ShowMessage("\033[0m---Start reading of Ladmin configuration file (%s)\n", cfgName);
-	}
+	ShowMessage("\033[0m---Start reading of Ladmin configuration file (%s)\n", cfgName);
 	while(fgets(line, sizeof(line), fp))
 	{
 		if (line[0] == '/' && line[1] == '/')
@@ -4281,11 +2978,7 @@ int ladmin_config_read(const char *cfgName)
 				uint32 ipl = host2ip(w2);
 				if (ipl != 0) {
 					ip2str(ipl, loginserverip);
-					if (defaultlanguage == 'F') {
-						ShowMessage("Adresse du serveur de logins: %s -> %s\n", w2, loginserverip);
-					} else {
-						ShowMessage("Login server IP address: %s -> %s\n", w2, loginserverip);
-					}
+					ShowMessage("Login server IP address: %s -> %s\n", w2, loginserverip);
 				} else
 					memcpy(loginserverip, w2, 16);
 			} else if (strcmpi(w1, "login_port") == 0) {
@@ -4297,9 +2990,6 @@ int ladmin_config_read(const char *cfgName)
 				passenc = atoi(w2);
 				if (passenc < 0 || passenc > 2)
 					passenc = 0;
-			} else if (strcmpi(w1, "defaultlanguage") == 0) {
-				if (w2[0] == 'F' || w2[0] == 'E')
-					defaultlanguage = w2[0];
 			} else if (strcmpi(w1, "ladmin_log_filename") == 0) {
 				strncpy(ladmin_log_filename, w2, sizeof(ladmin_log_filename));
 				ladmin_log_filename[sizeof(ladmin_log_filename)-1] = '\0';
@@ -4316,11 +3006,7 @@ int ladmin_config_read(const char *cfgName)
 
 	login_ip = str2ip(loginserverip);
 
-	if (defaultlanguage == 'F') {
-		ShowMessage("---Lecture du fichier de configuration Ladmin termin馥.\n");
-	} else {
-		ShowMessage("---End reading of Ladmin configuration file.\n");
-	}
+	ShowMessage("---End reading of Ladmin configuration file.\n");
 
 	return 0;
 }
@@ -4340,13 +3026,8 @@ void do_final(void)
 {
 	if (already_exit_function == 0) {
 
-		if (defaultlanguage == 'F') {
-			ShowMessage("\033[0m----Fin de Ladmin (fin normale avec fermeture de tous les fichiers).\n");
-			ladmin_log("----Fin de Ladmin (fin normale avec fermeture de tous les fichiers).\n");
-		} else {
-			ShowMessage("\033[0m----End of Ladmin (normal end with closing of all files).\n");
-			ladmin_log("----End of Ladmin (normal end with closing of all files).\n");
-		}
+		ShowMessage("\033[0m----End of Ladmin (normal end with closing of all files).\n");
+		ladmin_log("----End of Ladmin (normal end with closing of all files).\n");
 
 		already_exit_function = 1;
 		do_close(login_fd);
@@ -4365,31 +3046,17 @@ int do_init(int argc, char **argv)
 	ladmin_config_read((argc > 1) ? argv[1] : LADMIN_CONF_NAME);
 
 	ladmin_log("");
-	if (defaultlanguage == 'F') {
-		ladmin_log("Fichier de configuration lu.\n");
-	} else {
-		ladmin_log("Configuration file readed.\n");
-	}
+	ladmin_log("Configuration file readed.\n");
 
 	srand(time(NULL));
 
 	set_defaultparse(parse_fromlogin);
 
-	if (defaultlanguage == 'F') {
-		ShowMessage("Outil d'administration � distance de eAthena.\n");
-		ShowMessage("(pour eAthena version %d.%d.%d.)\n", ATHENA_MAJOR_VERSION, ATHENA_MINOR_VERSION, ATHENA_REVISION);
-	} else {
-		ShowMessage("EAthena login-server administration tool.\n");
-		ShowMessage("(for eAthena version %d.%d.%d.)\n", ATHENA_MAJOR_VERSION, ATHENA_MINOR_VERSION, ATHENA_REVISION);
-	}
+	ShowMessage("EAthena login-server administration tool.\n");
+	ShowMessage("(for eAthena version %d.%d.%d.)\n", ATHENA_MAJOR_VERSION, ATHENA_MINOR_VERSION, ATHENA_REVISION);
 
-	if (defaultlanguage == 'F') {
-		ladmin_log("Ladmin est pr黎.\n");
-		ShowMessage("Ladmin est \033[1;32mpr黎\033[0m.\n\n");
-	} else {
-		ladmin_log("Ladmin is ready.\n");
-		ShowMessage("Ladmin is \033[1;32mready\033[0m.\n\n");
-	}
+	ladmin_log("Ladmin is ready.\n");
+	ShowMessage("Ladmin is \033[1;32mready\033[0m.\n\n");
 
 	Connect_login_server();
 
diff --git a/src/login/Makefile.in b/src/login/Makefile.in
index aeb41b667..1f6080746 100644
--- a/src/login/Makefile.in
+++ b/src/login/Makefile.in
@@ -10,36 +10,71 @@ COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h
 	../common/grfio.h ../common/mapindex.h \
 	../common/ers.h ../common/md5calc.h
 
-LOGIN_OBJ = obj_txt/login.o obj_txt/admin.o
-LOGIN_H = login.h
+COMMON_SQL_OBJ = ../common/obj_sql/sql.o
+COMMON_SQL_H = ../common/sql.h
+
+LOGIN_OBJ = login.o admin.o
+LOGIN_TXT_OBJ = $(LOGIN_OBJ:%=obj_txt/%) \
+	obj_txt/account_txt.o obj_txt/ipban_txt.o obj_txt/loginlog_txt.o
+LOGIN_SQL_OBJ = $(LOGIN_OBJ:%=obj_sql/%) \
+	obj_sql/account_sql.o obj_sql/ipban_sql.o obj_sql/loginlog_sql.o
+LOGIN_H = login.h account.h ipban.h loginlog.h
+
+HAVE_MYSQL=@HAVE_MYSQL@
+ifeq ($(HAVE_MYSQL),yes)
+	LOGIN_SERVER_SQL_DEPENDS=obj_sql $(LOGIN_SQL_OBJ) $(COMMON_OBJ) $(COMMON_SQL_OBJ)
+else
+	LOGIN_SERVER_SQL_DEPENDS=needs_mysql
+endif
 
 @SET_MAKE@
 
 #####################################################################
-.PHONY : all login-server clean help
+.PHONY :all txt sql clean help
 
-all: login-server
+all: txt sql
 
-login-server: obj_txt $(LOGIN_OBJ) $(COMMON_OBJ)
-	@CC@ @LDFLAGS@ -o ../../login-server@EXEEXT@ $(LOGIN_OBJ) $(COMMON_OBJ) @LIBS@ 
+txt: obj_txt login-server
+
+sql: obj_sql login-server_sql
 
 clean:
-	rm -rf *.o obj_txt ../../login-server@EXEEXT@
+	rm -rf *.o obj_txt obj_sql ../../login-server@EXEEXT@ ../../login-server_sql@EXEEXT@
 
 help:
-	@echo "possible targets are 'login-server' 'all' 'clean' 'help'"
-	@echo "'login-server'  - login server (TXT version)"
-	@echo "'all'           - builds all above targets"
-	@echo "'clean'         - cleans builds and objects"
-	@echo "'help'          - outputs this message"
+	@echo "possible targets are 'sql' 'txt' 'all' 'clean' 'help'"
+	@echo "'sql'       - login server (SQL version)"
+	@echo "'txt'       - login server (TXT version)"
+	@echo "'all'       - builds all above targets"
+	@echo "'clean'     - cleans builds and objects"
+	@echo "'help'      - outputs this message"
 
 #####################################################################
 
+needs_mysql:
+	@echo "MySQL not found or disabled by the configure script"
+	@exit 1
+
+# object directories
 obj_txt:
-	-mkdir obj_txt
+	test -d obj_txt || mkdir obj_txt
 
+obj_sql:
+	test -d obj_sql || mkdir obj_sql
+
+#executables
+login-server: $(LOGIN_TXT_OBJ) $(COMMON_OBJ)
+	@CC@ @LDFLAGS@ -o ../../login-server@EXEEXT@ $(LOGIN_TXT_OBJ) $(COMMON_OBJ) @LIBS@ 
+
+login-server_sql: $(LOGIN_SERVER_SQL_DEPENDS)
+	@CC@ @LDFLAGS@ -o ../../login-server_sql@EXEEXT@ $(LOGIN_SQL_OBJ) $(COMMON_OBJ) $(COMMON_SQL_OBJ) @LIBS@ @MYSQL_LIBS@
+
+# login object files
 obj_txt/%.o: %.c $(LOGIN_H) $(COMMON_H)
-	@CC@ @CFLAGS@ $(CUSTOM_CFLAGS) -DTXT_ONLY @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+	@CC@ @CFLAGS@ $(CUSTOM_CFLAGS) -DWITH_TXT @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+
+obj_sql/%.o: %.c $(LOGIN_H) $(COMMON_H)
+	@CC@ @CFLAGS@ $(CUSTOM_CFLAGS) -DWITH_SQL @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
 
 # missing common object files
 ../common/obj_all/%.o:
diff --git a/src/login/account.h b/src/login/account.h
new file mode 100644
index 000000000..4cc9b353b
--- /dev/null
+++ b/src/login/account.h
@@ -0,0 +1,159 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#ifndef __ACCOUNT_H_INCLUDED__
+#define __ACCOUNT_H_INCLUDED__
+
+#include "../common/cbasetypes.h"
+#include "../common/mmo.h" // ACCOUNT_REG2_NUM
+
+typedef struct AccountDB AccountDB;
+typedef struct AccountDBIterator AccountDBIterator;
+
+
+// standard engines
+#ifdef WITH_TXT
+AccountDB* account_db_txt(void);
+#endif
+#ifdef WITH_SQL
+AccountDB* account_db_sql(void);
+#endif
+// extra engines (will probably use the other txt functions)
+#define ACCOUNTDB_CONSTRUCTOR_(engine) account_db_##engine
+#define ACCOUNTDB_CONSTRUCTOR(engine) ACCOUNTDB_CONSTRUCTOR_(engine)
+#ifdef ACCOUNTDB_ENGINE_0
+AccountDB* ACCOUNTDB_CONSTRUCTOR(ACCOUNTDB_ENGINE_0)(void);
+#endif
+#ifdef ACCOUNTDB_ENGINE_1
+AccountDB* ACCOUNTDB_CONSTRUCTOR(ACCOUNTDB_ENGINE_1)(void);
+#endif
+#ifdef ACCOUNTDB_ENGINE_2
+AccountDB* ACCOUNTDB_CONSTRUCTOR(ACCOUNTDB_ENGINE_2)(void);
+#endif
+#ifdef ACCOUNTDB_ENGINE_3
+AccountDB* ACCOUNTDB_CONSTRUCTOR(ACCOUNTDB_ENGINE_3)(void);
+#endif
+#ifdef ACCOUNTDB_ENGINE_4
+AccountDB* ACCOUNTDB_CONSTRUCTOR(ACCOUNTDB_ENGINE_4)(void);
+#endif
+
+
+struct mmo_account
+{
+	int account_id;
+	char userid[24];
+	char pass[32+1];        // 23+1 for plaintext, 32+1 for md5-ed passwords
+	char sex;               // gender (M/F/S)
+	char email[40];         // e-mail (by default: a@a.com)
+	int level;              // GM level
+	unsigned int state;     // packet 0x006a value + 1 (0: compte OK)
+	time_t unban_time;      // (timestamp): ban time limit of the account (0 = no ban)
+	time_t expiration_time; // (timestamp): validity limit of the account (0 = unlimited)
+	unsigned int logincount;// number of successful auth attempts
+	char lastlogin[24];     // date+time of last successful login
+	char last_ip[16];       // save of last IP of connection
+	int account_reg2_num;
+	struct global_reg account_reg2[ACCOUNT_REG2_NUM]; // account script variables (stored on login server)
+};
+
+
+struct AccountDBIterator
+{
+	/// Destroys this iterator, releasing all allocated memory (including itself).
+	///
+	/// @param self Iterator
+	void (*destroy)(AccountDBIterator* self);
+
+	/// Fetches the next account in the database.
+	/// Fills acc with the account data.
+	/// @param self Iterator
+	/// @param acc Account data
+	/// @return true if successful
+	bool (*next)(AccountDBIterator* self, struct mmo_account* acc);
+};
+
+
+struct AccountDB
+{
+	/// Initializes this database, making it ready for use.
+	/// Call this after setting the properties.
+	///
+	/// @param self Database
+	/// @return true if successful
+	bool (*init)(AccountDB* self);
+
+	/// Destroys this database, releasing all allocated memory (including itself).
+	///
+	/// @param self Database
+	void (*destroy)(AccountDB* self);
+
+	/// Gets a property from this database.
+	/// These read-only properties must be implemented:
+	/// "engine.name" -> "txt", "sql", ...
+	/// "engine.version" -> internal version
+	/// "engine.comment" -> anything (suggestion: description or specs of the engine)
+	///
+	/// @param self Database
+	/// @param key Property name
+	/// @param buf Buffer for the value
+	/// @param buflen Buffer length
+	/// @return true if successful
+	bool (*get_property)(AccountDB* self, const char* key, char* buf, size_t buflen);
+
+	/// Sets a property in this database.
+	///
+	/// @param self Database
+	/// @param key Property name
+	/// @param value Property value
+	/// @return true if successful
+	bool (*set_property)(AccountDB* self, const char* key, const char* value);
+
+	/// Creates a new account in this database.
+	/// If acc->account_id is not -1, the provided value will be used.
+	/// Otherwise the account_id will be auto-generated and written to acc->account_id.
+	///
+	/// @param self Database
+	/// @param acc Account data
+	/// @return true if successful
+	bool (*create)(AccountDB* self, struct mmo_account* acc);
+
+	/// Removes an account from this database.
+	///
+	/// @param self Database
+	/// @param account_id Account id
+	/// @return true if successful
+	bool (*remove)(AccountDB* self, const int account_id);
+
+	/// Modifies the data of an existing account.
+	/// Uses acc->account_id to identify the account.
+	///
+	/// @param self Database
+	/// @param acc Account data
+	/// @return true if successful
+	bool (*save)(AccountDB* self, const struct mmo_account* acc);
+
+	/// Finds an account with account_id and copies it to acc.
+	///
+	/// @param self Database
+	/// @param acc Pointer that receives the account data
+	/// @param account_id Target account id
+	/// @return true if successful
+	bool (*load_num)(AccountDB* self, struct mmo_account* acc, const int account_id);
+
+	/// Finds an account with userid and copies it to acc.
+	///
+	/// @param self Database
+	/// @param acc Pointer that receives the account data
+	/// @param userid Target username
+	/// @return true if successful
+	bool (*load_str)(AccountDB* self, struct mmo_account* acc, const char* userid);
+
+	/// Returns a new forward iterator.
+	///
+	/// @param self Database
+	/// @return Iterator
+	AccountDBIterator* (*iterator)(AccountDB* self);
+};
+
+
+#endif // __ACCOUNT_H_INCLUDED__
diff --git a/src/login/account_sql.c b/src/login/account_sql.c
new file mode 100644
index 000000000..b510949fa
--- /dev/null
+++ b/src/login/account_sql.c
@@ -0,0 +1,578 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/sql.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "account.h"
+#include <stdlib.h>
+#include <string.h>
+
+/// global defines
+#define ACCOUNT_SQL_DB_VERSION 20080417
+
+/// internal structure
+typedef struct AccountDB_SQL
+{
+	AccountDB vtable;    // public interface
+
+	Sql* accounts;       // SQL accounts storage
+
+	char db_hostname[32];
+	uint16 db_port;
+	char db_username[32];
+	char db_password[32];
+	char db_database[32];
+	char codepage[32];
+	bool case_sensitive;
+	char account_db[32];
+	char accreg_db[32];
+
+} AccountDB_SQL;
+
+/// internal structure
+typedef struct AccountDBIterator_SQL
+{
+	AccountDBIterator vtable;    // public interface
+
+	AccountDB_SQL* db;
+	int last_account_id;
+} AccountDBIterator_SQL;
+
+/// internal functions
+static bool account_db_sql_init(AccountDB* self);
+static void account_db_sql_destroy(AccountDB* self);
+static bool account_db_sql_get_property(AccountDB* self, const char* key, char* buf, size_t buflen);
+static bool account_db_sql_set_property(AccountDB* self, const char* option, const char* value);
+static bool account_db_sql_create(AccountDB* self, struct mmo_account* acc);
+static bool account_db_sql_remove(AccountDB* self, const int account_id);
+static bool account_db_sql_save(AccountDB* self, const struct mmo_account* acc);
+static bool account_db_sql_load_num(AccountDB* self, struct mmo_account* acc, const int account_id);
+static bool account_db_sql_load_str(AccountDB* self, struct mmo_account* acc, const char* userid);
+static AccountDBIterator* account_db_sql_iterator(AccountDB* self);
+static void account_db_sql_iter_destroy(AccountDBIterator* self);
+static bool account_db_sql_iter_next(AccountDBIterator* self, struct mmo_account* acc);
+
+static bool mmo_auth_fromsql(AccountDB_SQL* db, struct mmo_account* acc, int account_id);
+static bool mmo_auth_tosql(AccountDB_SQL* db, const struct mmo_account* acc, bool is_new);
+
+/// public constructor
+AccountDB* account_db_sql(void)
+{
+	AccountDB_SQL* db = (AccountDB_SQL*)aCalloc(1, sizeof(AccountDB_SQL));
+
+	// set up the vtable
+	db->vtable.init         = &account_db_sql_init;
+	db->vtable.destroy      = &account_db_sql_destroy;
+	db->vtable.get_property = &account_db_sql_get_property;
+	db->vtable.set_property = &account_db_sql_set_property;
+	db->vtable.save         = &account_db_sql_save;
+	db->vtable.create       = &account_db_sql_create;
+	db->vtable.remove       = &account_db_sql_remove;
+	db->vtable.load_num     = &account_db_sql_load_num;
+	db->vtable.load_str     = &account_db_sql_load_str;
+	db->vtable.iterator     = &account_db_sql_iterator;
+
+	// initialize to default values
+	db->accounts = NULL;
+	safestrncpy(db->db_hostname, "127.0.0.1", sizeof(db->db_hostname));
+	db->db_port = 3306;
+	safestrncpy(db->db_username, "ragnarok", sizeof(db->db_username));
+	safestrncpy(db->db_password, "ragnarok", sizeof(db->db_password));
+	safestrncpy(db->db_database, "ragnarok", sizeof(db->db_database));
+	safestrncpy(db->codepage, "", sizeof(db->codepage));
+	db->case_sensitive = false;
+	safestrncpy(db->account_db, "login", sizeof(db->account_db));
+	safestrncpy(db->accreg_db, "global_reg_value", sizeof(db->accreg_db));
+
+	return &db->vtable;
+}
+
+
+/* ------------------------------------------------------------------------- */
+
+
+/// establishes database connection
+static bool account_db_sql_init(AccountDB* self)
+{
+	AccountDB_SQL* db = (AccountDB_SQL*)self;
+	Sql* sql_handle;
+
+	db->accounts = Sql_Malloc();
+	sql_handle = db->accounts;
+
+	if( SQL_ERROR == Sql_Connect(sql_handle, db->db_username, db->db_password, db->db_hostname, db->db_port, db->db_database) )
+	{
+		Sql_ShowDebug(sql_handle);
+		Sql_Free(db->accounts);
+		db->accounts = NULL;
+		return false;
+	}
+
+	if( db->codepage[0] != '\0' && SQL_ERROR == Sql_SetEncoding(sql_handle, db->codepage) )
+		Sql_ShowDebug(sql_handle);
+
+	return true;
+}	
+
+/// disconnects from database
+static void account_db_sql_destroy(AccountDB* self)
+{
+	AccountDB_SQL* db = (AccountDB_SQL*)self;
+
+	Sql_Free(db->accounts);
+	db->accounts = NULL;
+}
+
+/// Gets a property from this database.
+static bool account_db_sql_get_property(AccountDB* self, const char* key, char* buf, size_t buflen)
+{
+	AccountDB_SQL* db = (AccountDB_SQL*)self;
+	const char* signature = "account.sql.";
+
+	if( strcmp(key, "engine.name") == 0 )
+	{
+		safesnprintf(buf, buflen, "sql");
+		return true;
+	}
+	if( strcmp(key, "engine.version") == 0 )
+	{
+		safesnprintf(buf, buflen, "%d", ACCOUNT_SQL_DB_VERSION);
+		return true;
+	}
+	if( strcmp(key, "engine.comment") == 0 )
+	{
+		safesnprintf(buf, buflen, "SQL Account Database");
+		return true;
+	}
+
+	if( strncmp(key, signature, strlen(signature)) != 0 )
+		return false;
+
+	key += strlen(signature);
+
+	if( strcmpi(key, "db_hostname") == 0 )
+		safesnprintf(buf, buflen, "%s", db->db_hostname);
+	else
+	if( strcmpi(key, "db_port") == 0 )
+		safesnprintf(buf, buflen, "%d", db->db_port);
+	else
+	if( strcmpi(key, "db_username") == 0 )
+		safesnprintf(buf, buflen, "%s", db->db_username);
+	else
+	if( strcmpi(key, "db_password") == 0 )
+		safesnprintf(buf, buflen, "%s", db->db_password);
+	else
+	if( strcmpi(key, "db_database") == 0 )
+		safesnprintf(buf, buflen, "%s", db->db_database);
+	else
+	if( strcmpi(key, "codepage") == 0 )
+		safesnprintf(buf, buflen, "%s", db->codepage);
+	else
+	if( strcmpi(key, "case_sensitive") == 0 )
+		safesnprintf(buf, buflen, "%d", (db->case_sensitive ? 1 : 0));
+	else
+	if( strcmpi(key, "account_db") == 0 )
+		safesnprintf(buf, buflen, "%s", db->account_db);
+	else
+	if( strcmpi(key, "accreg_db") == 0 )
+		safesnprintf(buf, buflen, "%s", db->accreg_db);
+	else
+		return false;// not found
+
+	return true;
+}
+
+/// if the option is supported, adjusts the internal state
+static bool account_db_sql_set_property(AccountDB* self, const char* key, const char* value)
+{
+	AccountDB_SQL* db = (AccountDB_SQL*)self;
+	const char* signature = "account.sql.";
+
+	if( strncmp(key, signature, strlen(signature)) != 0 )
+		return false;
+
+	key += strlen(signature);
+
+	if( strcmpi(key, "db_hostname") == 0 )
+		safestrncpy(db->db_hostname, value, sizeof(db->db_hostname));
+	else
+	if( strcmpi(key, "db_port") == 0 )
+		db->db_port = (uint16)strtoul(value, NULL, 10);
+	else
+	if( strcmpi(key, "db_username") == 0 )
+		safestrncpy(db->db_username, value, sizeof(db->db_username));
+	else
+	if( strcmpi(key, "db_password") == 0 )
+		safestrncpy(db->db_password, value, sizeof(db->db_password));
+	else
+	if( strcmpi(key, "db_database") == 0 )
+		safestrncpy(db->db_database, value, sizeof(db->db_database));
+	else
+	if( strcmpi(key, "codepage") == 0 )
+		safestrncpy(db->codepage, value, sizeof(db->codepage));
+	else
+	if( strcmpi(key, "case_sensitive") == 0 )
+		db->case_sensitive = config_switch(value);
+	else
+	if( strcmpi(key, "account_db") == 0 )
+		safestrncpy(db->account_db, value, sizeof(db->account_db));
+	else
+	if( strcmpi(key, "accreg_db") == 0 )
+		safestrncpy(db->accreg_db, value, sizeof(db->accreg_db));
+	else // no match
+		return false;
+
+	return true;
+}
+
+/// create a new account entry
+/// If acc->account_id is -1, the account id will be auto-generated,
+/// and its value will be written to acc->account_id if everything succeeds.
+static bool account_db_sql_create(AccountDB* self, struct mmo_account* acc)
+{
+	AccountDB_SQL* db = (AccountDB_SQL*)self;
+	Sql* sql_handle = db->accounts;
+
+	// decide on the account id to assign
+	int account_id;
+	if( acc->account_id != -1 )
+	{// caller specifies it manually
+		account_id = acc->account_id;
+	}
+	else
+	{// ask the database
+		char* data;
+		size_t len;
+
+		if( SQL_SUCCESS != Sql_Query(sql_handle, "SELECT MAX(`account_id`)+1 FROM `%s`", db->account_db) )
+		{
+			Sql_ShowDebug(sql_handle);
+			return false;
+		}
+		if( SQL_SUCCESS != Sql_NextRow(sql_handle) )
+		{
+			Sql_ShowDebug(sql_handle);
+			Sql_FreeResult(sql_handle);
+			return false;
+		}
+
+		Sql_GetData(sql_handle, 0, &data, &len);
+		account_id = ( data != NULL ) ? atoi(data) : 0;
+		Sql_FreeResult(sql_handle);
+
+		if( account_id < START_ACCOUNT_NUM )
+			account_id = START_ACCOUNT_NUM;
+
+	}
+
+	// zero value is prohibited
+	if( account_id == 0 )
+		return false;
+
+	// absolute maximum
+	if( account_id > END_ACCOUNT_NUM )
+		return false;
+
+	// insert the data into the database
+	acc->account_id = account_id;
+	return mmo_auth_tosql(db, acc, true);
+}
+
+/// delete an existing account entry + its regs
+static bool account_db_sql_remove(AccountDB* self, const int account_id)
+{
+	AccountDB_SQL* db = (AccountDB_SQL*)self;
+	Sql* sql_handle = db->accounts;
+	bool result = false;
+
+	if( SQL_SUCCESS != Sql_QueryStr(sql_handle, "START TRANSACTION")
+	||  SQL_SUCCESS != Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `account_id` = %d", db->account_db, account_id)
+	||  SQL_SUCCESS != Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `account_id` = %d", db->accreg_db, account_id) )
+		Sql_ShowDebug(sql_handle);
+	else
+		result = true;
+
+	result &= ( SQL_SUCCESS == Sql_QueryStr(sql_handle, (result == true) ? "COMMIT" : "ROLLBACK") );
+
+	return result;
+}
+
+/// update an existing account with the provided new data (both account and regs)
+static bool account_db_sql_save(AccountDB* self, const struct mmo_account* acc)
+{
+	AccountDB_SQL* db = (AccountDB_SQL*)self;
+	return mmo_auth_tosql(db, acc, false);
+}
+
+/// retrieve data from db and store it in the provided data structure
+static bool account_db_sql_load_num(AccountDB* self, struct mmo_account* acc, const int account_id)
+{
+	AccountDB_SQL* db = (AccountDB_SQL*)self;
+	return mmo_auth_fromsql(db, acc, account_id);
+}
+
+/// retrieve data from db and store it in the provided data structure
+static bool account_db_sql_load_str(AccountDB* self, struct mmo_account* acc, const char* userid)
+{
+	AccountDB_SQL* db = (AccountDB_SQL*)self;
+	Sql* sql_handle = db->accounts;
+	char esc_userid[2*NAME_LENGTH+1];
+	int account_id;
+	char* data;
+
+	Sql_EscapeString(sql_handle, esc_userid, userid);
+
+	// get the list of account IDs for this user ID
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `account_id` FROM `%s` WHERE `userid`= %s '%s'",
+		db->account_db, (db->case_sensitive ? "BINARY" : ""), esc_userid) )
+	{
+		Sql_ShowDebug(sql_handle);
+		return false;
+	}
+
+	if( Sql_NumRows(sql_handle) > 1 )
+	{// serious problem - duplicit account
+		ShowError("account_db_sql_load_str: multiple accounts found when retrieving data for account '%s'!\n", userid);
+		Sql_FreeResult(sql_handle);
+		return false;
+	}
+
+	if( SQL_SUCCESS != Sql_NextRow(sql_handle) )
+	{// no such entry
+		Sql_FreeResult(sql_handle);
+		return false;
+	}
+
+	Sql_GetData(sql_handle, 0, &data, NULL);
+	account_id = atoi(data);
+
+	return account_db_sql_load_num(self, acc, account_id);
+}
+
+
+/// Returns a new forward iterator.
+static AccountDBIterator* account_db_sql_iterator(AccountDB* self)
+{
+	AccountDB_SQL* db = (AccountDB_SQL*)self;
+	AccountDBIterator_SQL* iter = (AccountDBIterator_SQL*)aCalloc(1, sizeof(AccountDBIterator_SQL));
+
+	// set up the vtable
+	iter->vtable.destroy = &account_db_sql_iter_destroy;
+	iter->vtable.next    = &account_db_sql_iter_next;
+
+	// fill data
+	iter->db = db;
+	iter->last_account_id = -1;
+
+	return &iter->vtable;
+}
+
+
+/// Destroys this iterator, releasing all allocated memory (including itself).
+static void account_db_sql_iter_destroy(AccountDBIterator* self)
+{
+	AccountDBIterator_SQL* iter = (AccountDBIterator_SQL*)self;
+	aFree(iter);
+}
+
+
+/// Fetches the next account in the database.
+static bool account_db_sql_iter_next(AccountDBIterator* self, struct mmo_account* acc)
+{
+	AccountDBIterator_SQL* iter = (AccountDBIterator_SQL*)self;
+	AccountDB_SQL* db = (AccountDB_SQL*)iter->db;
+	Sql* sql_handle = db->accounts;
+	int account_id;
+	char* data;
+
+	// get next account ID
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `account_id` FROM `%s` WHERE `account_id` > '%d' ORDER BY `account_id` ASC LIMIT 1",
+		db->account_db, iter->last_account_id) )
+	{
+		Sql_ShowDebug(sql_handle);
+		return false;
+	}
+
+	if( SQL_SUCCESS == Sql_NextRow(sql_handle) &&
+		SQL_SUCCESS == Sql_GetData(sql_handle, 0, &data, NULL) &&
+		data != NULL )
+	{// get account data
+		account_id = atoi(data);
+		if( mmo_auth_fromsql(db, acc, account_id) )
+		{
+			iter->last_account_id = account_id;
+			Sql_FreeResult(sql_handle);
+			return true;
+		}
+	}
+	Sql_FreeResult(sql_handle);
+	return false;
+}
+
+
+static bool mmo_auth_fromsql(AccountDB_SQL* db, struct mmo_account* acc, int account_id)
+{
+	Sql* sql_handle = db->accounts;
+	char* data;
+	int i = 0;
+
+	// retrieve login entry for the specified account
+	if( SQL_ERROR == Sql_Query(sql_handle,
+	    "SELECT `account_id`,`userid`,`user_pass`,`sex`,`email`,`level`,`state`,`unban_time`,`expiration_time`,`logincount`,`lastlogin`,`last_ip` FROM `%s` WHERE `account_id` = %d",
+		db->account_db, account_id )
+	) {
+		Sql_ShowDebug(sql_handle);
+		return false;
+	}
+
+	if( SQL_SUCCESS != Sql_NextRow(sql_handle) )
+	{// no such entry
+		Sql_FreeResult(sql_handle);
+		return false;
+	}
+
+	Sql_GetData(sql_handle,  0, &data, NULL); acc->account_id = atoi(data);
+	Sql_GetData(sql_handle,  1, &data, NULL); safestrncpy(acc->userid, data, sizeof(acc->userid));
+	Sql_GetData(sql_handle,  2, &data, NULL); safestrncpy(acc->pass, data, sizeof(acc->pass));
+	Sql_GetData(sql_handle,  3, &data, NULL); acc->sex = data[0];
+	Sql_GetData(sql_handle,  4, &data, NULL); safestrncpy(acc->email, data, sizeof(acc->email));
+	Sql_GetData(sql_handle,  5, &data, NULL); acc->level = atoi(data);
+	Sql_GetData(sql_handle,  6, &data, NULL); acc->state = strtoul(data, NULL, 10);
+	Sql_GetData(sql_handle,  7, &data, NULL); acc->unban_time = atol(data);
+	Sql_GetData(sql_handle,  8, &data, NULL); acc->expiration_time = atol(data);
+	Sql_GetData(sql_handle,  9, &data, NULL); acc->logincount = strtoul(data, NULL, 10);
+	Sql_GetData(sql_handle, 10, &data, NULL); safestrncpy(acc->lastlogin, data, sizeof(acc->lastlogin));
+	Sql_GetData(sql_handle, 11, &data, NULL); safestrncpy(acc->last_ip, data, sizeof(acc->last_ip));
+
+	Sql_FreeResult(sql_handle);
+
+
+	// retrieve account regs for the specified user
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `str`,`value` FROM `%s` WHERE `type`='1' AND `account_id`='%d'", db->accreg_db, acc->account_id) )
+	{
+		Sql_ShowDebug(sql_handle);
+		return false;
+	}
+
+	acc->account_reg2_num = (int)Sql_NumRows(sql_handle);
+
+	while( SQL_SUCCESS == Sql_NextRow(sql_handle) )
+	{
+		char* data;
+		Sql_GetData(sql_handle, 0, &data, NULL); safestrncpy(acc->account_reg2[i].str, data, sizeof(acc->account_reg2[i].str));
+		Sql_GetData(sql_handle, 1, &data, NULL); safestrncpy(acc->account_reg2[i].value, data, sizeof(acc->account_reg2[i].value));
+		++i;
+	}
+	Sql_FreeResult(sql_handle);
+
+	if( i != acc->account_reg2_num )
+		return false;
+
+	return true;
+}
+
+static bool mmo_auth_tosql(AccountDB_SQL* db, const struct mmo_account* acc, bool is_new)
+{
+	Sql* sql_handle = db->accounts;
+	SqlStmt* stmt = SqlStmt_Malloc(sql_handle);
+	bool result = false;
+	int i;
+
+	// try
+	do
+	{
+
+	if( SQL_SUCCESS != Sql_QueryStr(sql_handle, "START TRANSACTION") )
+	{
+		Sql_ShowDebug(sql_handle);
+		break;
+	}
+
+	if( is_new )
+	{// insert into account table
+		if( SQL_SUCCESS != SqlStmt_Prepare(stmt,
+			"INSERT INTO `%s` (`account_id`, `userid`, `user_pass`, `sex`, `email`, `level`, `state`, `unban_time`, `expiration_time`, `logincount`, `lastlogin`, `last_ip`) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+			db->account_db)
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  0, SQLDT_INT,    (void*)&acc->account_id,      sizeof(acc->account_id))
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  1, SQLDT_STRING, (void*)acc->userid,           strlen(acc->userid))
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  2, SQLDT_STRING, (void*)acc->pass,             strlen(acc->pass))
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  3, SQLDT_ENUM,   (void*)&acc->sex,             sizeof(acc->sex))
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  4, SQLDT_STRING, (void*)&acc->email,           strlen(acc->email))
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  5, SQLDT_INT,    (void*)&acc->level,           sizeof(acc->level))
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  6, SQLDT_UINT,   (void*)&acc->state,           sizeof(acc->state))
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  7, SQLDT_LONG,   (void*)&acc->unban_time,      sizeof(acc->unban_time))
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  8, SQLDT_INT,    (void*)&acc->expiration_time, sizeof(acc->expiration_time))
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  9, SQLDT_UINT,   (void*)&acc->logincount,      sizeof(acc->logincount))
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 10, SQLDT_STRING, (void*)&acc->lastlogin,       strlen(acc->lastlogin))
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 11, SQLDT_STRING, (void*)&acc->last_ip,         strlen(acc->last_ip))
+		||  SQL_SUCCESS != SqlStmt_Execute(stmt)
+		) {
+			SqlStmt_ShowDebug(stmt);
+			break;
+		}
+	}
+	else
+	{// update account table
+		stmt = SqlStmt_Malloc(sql_handle);
+		if( SQL_SUCCESS != SqlStmt_Prepare(stmt, "UPDATE `%s` SET `userid`=?,`user_pass`=?,`sex`=?,`email`=?,`level`=?,`state`=?,`unban_time`=?,`expiration_time`=?,`logincount`=?,`lastlogin`=?,`last_ip`=? WHERE `account_id` = '%d'", db->account_db, acc->account_id)
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  0, SQLDT_STRING, (void*)acc->userid,           strlen(acc->userid))
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  1, SQLDT_STRING, (void*)acc->pass,             strlen(acc->pass))
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  2, SQLDT_ENUM,   (void*)&acc->sex,             sizeof(acc->sex))
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  3, SQLDT_STRING, (void*)acc->email,            strlen(acc->email))
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  4, SQLDT_INT,    (void*)&acc->level,           sizeof(acc->level))
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  5, SQLDT_UINT,   (void*)&acc->state,           sizeof(acc->state))
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  6, SQLDT_LONG,   (void*)&acc->unban_time,      sizeof(acc->unban_time))
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  7, SQLDT_LONG,   (void*)&acc->expiration_time, sizeof(acc->expiration_time))
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  8, SQLDT_UINT,   (void*)&acc->logincount,      sizeof(acc->logincount))
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  9, SQLDT_STRING, (void*)&acc->lastlogin,       strlen(acc->lastlogin))
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 10, SQLDT_STRING, (void*)&acc->last_ip,         strlen(acc->last_ip))
+		||  SQL_SUCCESS != SqlStmt_Execute(stmt)
+		) {
+			SqlStmt_ShowDebug(stmt);
+			break;
+		}
+	}
+
+	// remove old account regs
+	if( SQL_SUCCESS != Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `type`='1' AND `account_id`='%d'", db->accreg_db, acc->account_id) )
+	{
+		Sql_ShowDebug(sql_handle);
+		break;
+	}
+	// insert new account regs
+	if( SQL_SUCCESS != SqlStmt_Prepare(stmt, "INSERT INTO `%s` (`type`, `account_id`, `str`, `value`) VALUES ( 1 , '%d' , ? , ? );",  db->accreg_db, acc->account_id) )
+	{
+		SqlStmt_ShowDebug(stmt);
+		break;
+	}
+	for( i = 0; i < acc->account_reg2_num; ++i )
+	{
+		if( SQL_SUCCESS != SqlStmt_BindParam(stmt, 0, SQLDT_STRING, (void*)acc->account_reg2[i].str, strlen(acc->account_reg2[i].str))
+		||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 1, SQLDT_STRING, (void*)acc->account_reg2[i].value, strlen(acc->account_reg2[i].value))
+		||  SQL_SUCCESS != SqlStmt_Execute(stmt)
+		) {
+			SqlStmt_ShowDebug(stmt);
+			break;
+		}
+	}
+	if( i < acc->account_reg2_num )
+	{
+		result = false;
+		break;
+	}
+
+	// if we got this far, everything was successful
+	result = true;
+
+	} while(0);
+	// finally
+
+	result &= ( SQL_SUCCESS == Sql_QueryStr(sql_handle, (result == true) ? "COMMIT" : "ROLLBACK") );
+	SqlStmt_Free(stmt);
+
+	return result;
+}
diff --git a/src/login/account_txt.c b/src/login/account_txt.c
new file mode 100644
index 000000000..cfcb6fb8f
--- /dev/null
+++ b/src/login/account_txt.c
@@ -0,0 +1,622 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#include "../common/db.h"
+#include "../common/lock.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "account.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/// global defines
+#define ACCOUNT_TXT_DB_VERSION 20080409
+#define AUTHS_BEFORE_SAVE 10 // flush every 10 saves
+#define AUTH_SAVING_INTERVAL 60000 // flush every 10 minutes
+
+/// internal structure
+typedef struct AccountDB_TXT
+{
+	AccountDB vtable;      // public interface
+
+	DBMap* accounts;       // in-memory accounts storage
+	int next_account_id;   // auto_increment
+	int auths_before_save; // prevents writing to disk too often
+	int save_timer;        // save timer id
+
+	char account_db[1024]; // account data storage file
+	bool case_sensitive;   // how to look up usernames
+
+} AccountDB_TXT;
+
+/// internal structure
+typedef struct AccountDBIterator_TXT
+{
+	AccountDBIterator vtable;      // public interface
+
+	DBIterator* iter;
+} AccountDBIterator_TXT;
+
+/// internal functions
+static bool account_db_txt_init(AccountDB* self);
+static void account_db_txt_destroy(AccountDB* self);
+static bool account_db_txt_get_property(AccountDB* self, const char* key, char* buf, size_t buflen);
+static bool account_db_txt_set_property(AccountDB* self, const char* option, const char* value);
+static bool account_db_txt_create(AccountDB* self, struct mmo_account* acc);
+static bool account_db_txt_remove(AccountDB* self, const int account_id);
+static bool account_db_txt_save(AccountDB* self, const struct mmo_account* acc);
+static bool account_db_txt_load_num(AccountDB* self, struct mmo_account* acc, const int account_id);
+static bool account_db_txt_load_str(AccountDB* self, struct mmo_account* acc, const char* userid);
+static AccountDBIterator* account_db_txt_iterator(AccountDB* self);
+static void account_db_txt_iter_destroy(AccountDBIterator* self);
+static bool account_db_txt_iter_next(AccountDBIterator* self, struct mmo_account* acc);
+
+static bool mmo_auth_fromstr(struct mmo_account* acc, char* str, unsigned int version);
+static bool mmo_auth_tostr(const struct mmo_account* acc, char* str);
+static void mmo_auth_sync(AccountDB_TXT* self);
+static int mmo_auth_sync_timer(int tid, unsigned int tick, int id, intptr data);
+
+/// public constructor
+AccountDB* account_db_txt(void)
+{
+	AccountDB_TXT* db = (AccountDB_TXT*)aCalloc(1, sizeof(AccountDB_TXT));
+
+	// set up the vtable
+	db->vtable.init         = &account_db_txt_init;
+	db->vtable.destroy      = &account_db_txt_destroy;
+	db->vtable.get_property = &account_db_txt_get_property;
+	db->vtable.set_property = &account_db_txt_set_property;
+	db->vtable.save         = &account_db_txt_save;
+	db->vtable.create       = &account_db_txt_create;
+	db->vtable.remove       = &account_db_txt_remove;
+	db->vtable.load_num     = &account_db_txt_load_num;
+	db->vtable.load_str     = &account_db_txt_load_str;
+	db->vtable.iterator     = &account_db_txt_iterator;
+
+	// initialize to default values
+	db->accounts = NULL;
+	db->next_account_id = START_ACCOUNT_NUM;
+	db->auths_before_save = AUTHS_BEFORE_SAVE;
+	db->save_timer = INVALID_TIMER;
+	safestrncpy(db->account_db, "save/account.txt", sizeof(db->account_db));
+	db->case_sensitive = false;
+
+	return &db->vtable;
+}
+
+
+/* ------------------------------------------------------------------------- */
+
+
+/// opens accounts file, loads it, and starts a periodic saving timer
+static bool account_db_txt_init(AccountDB* self)
+{
+	AccountDB_TXT* db = (AccountDB_TXT*)self;
+	DBMap* accounts;
+	FILE* fp;
+	char line[2048];
+	unsigned int version = 0;
+
+	// create accounts database
+	db->accounts = idb_alloc(DB_OPT_RELEASE_DATA);
+	accounts = db->accounts;
+
+	// open data file
+	fp = fopen(db->account_db, "r");
+	if( fp == NULL )
+	{
+		// no account file -> no account -> no login, including char-server (ERROR)
+		ShowError(CL_RED"account_db_txt_init: Accounts file [%s] not found."CL_RESET"\n", db->account_db);
+		return false;
+	}
+
+	// load data file
+	while( fgets(line, sizeof(line), fp) != NULL )
+	{
+		int account_id, n;
+		unsigned int v;
+		struct mmo_account acc;
+		struct mmo_account* tmp;
+		struct DBIterator* iter;
+		int (*compare)(const char* str1, const char* str2) = ( db->case_sensitive ) ? strcmp : stricmp;
+
+		if( line[0] == '/' && line[1] == '/' )
+			continue;
+
+		if( sscanf(line, "%d%n", &v, &n) == 1 && line[n] == '\n' )
+		{// format version definition
+			version = v;
+			continue;
+		}
+
+		if( sscanf(line, "%d\t%%newid%%%n", &account_id, &n) == 1 && line[n] == '\n' )
+		{// auto-increment
+			if( account_id > db->next_account_id )
+				db->next_account_id = account_id;
+			continue;
+		}
+
+		if( !mmo_auth_fromstr(&acc, line, version) )
+		{
+			ShowError("account_db_txt_init: skipping invalid data: %s", line);
+			continue;
+		}
+
+		// apply constraints & checks here
+		if( acc.sex != 'S' && (acc.account_id < START_ACCOUNT_NUM || acc.account_id > END_ACCOUNT_NUM) )
+			ShowWarning("account_db_txt_init: account %d:'%s' has ID outside of the defined range for accounts (min:%d max:%d)!\n", acc.account_id, acc.userid, START_ACCOUNT_NUM, END_ACCOUNT_NUM);
+
+		iter = accounts->iterator(accounts);
+		for( tmp = (struct mmo_account*)iter->first(iter,NULL); iter->exists(iter); tmp = (struct mmo_account*)iter->next(iter,NULL) )
+			if( compare(acc.userid, tmp->userid) == 0 )
+					break;
+		iter->destroy(iter);
+
+		if( tmp != NULL )
+		{// entry with identical username
+			ShowWarning("account_db_txt_init: account %d:'%s' has same username as account %d. The account will be inaccessible!\n", acc.account_id, acc.userid, tmp->account_id);
+		}
+
+		if( idb_get(accounts, acc.account_id) != NULL )
+		{// account id already occupied
+			ShowError("account_db_txt_init: ID collision for account id %d! Discarding data for account '%s'...\n", acc.account_id, acc.userid);
+			continue;
+		}
+
+		// record entry in db
+		tmp = (struct mmo_account*)aMalloc(sizeof(struct mmo_account));
+		memcpy(tmp, &acc, sizeof(struct mmo_account));
+		idb_put(accounts, acc.account_id, tmp);
+
+		if( db->next_account_id < acc.account_id)
+			db->next_account_id = acc.account_id + 1;
+	}
+
+	// close data file
+	fclose(fp);
+
+	// initialize data saving timer
+	add_timer_func_list(mmo_auth_sync_timer, "mmo_auth_sync_timer");
+	db->save_timer = add_timer_interval(gettick() + AUTH_SAVING_INTERVAL, mmo_auth_sync_timer, 0, (int)db, AUTH_SAVING_INTERVAL);
+
+	return true;
+}
+
+/// flush accounts db, close savefile and deallocate structures
+static void account_db_txt_destroy(AccountDB* self)
+{
+	AccountDB_TXT* db = (AccountDB_TXT*)self;
+	DBMap* accounts = db->accounts;
+
+	// stop saving timer
+	delete_timer(db->save_timer, mmo_auth_sync_timer);
+
+	// write data
+	mmo_auth_sync(db);
+
+	// delete accounts database
+	accounts->destroy(accounts, NULL);
+	db->accounts = NULL;
+
+	// delete entire structure
+	aFree(db);
+}
+
+/// Gets a property from this database.
+static bool account_db_txt_get_property(AccountDB* self, const char* key, char* buf, size_t buflen)
+{
+	AccountDB_TXT* db = (AccountDB_TXT*)self;
+	const char* signature = "account.txt.";
+
+	if( strcmp(key, "engine.name") == 0 )
+	{
+		safesnprintf(buf, buflen, "txt");
+		return true;
+	}
+	if( strcmp(key, "engine.version") == 0 )
+	{
+		safesnprintf(buf, buflen, "%d", ACCOUNT_TXT_DB_VERSION);
+		return true;
+	}
+	if( strcmp(key, "engine.comment") == 0 )
+	{
+		safesnprintf(buf, buflen, "TXT Account Database %d", ACCOUNT_TXT_DB_VERSION);
+		return true;
+	}
+
+	if( strncmp(key, signature, strlen(signature)) != 0 )
+		return false;
+
+	key += strlen(signature);
+
+	if( strcmpi(key, "account_db") == 0 )
+		safesnprintf(buf, buflen, "%s", db->account_db);
+	else if( strcmpi(key, "case_sensitive") == 0 )
+		safesnprintf(buf, buflen, "%d", (db->case_sensitive ? 1 : 0));
+	else
+		return false;// not found
+
+	return true;
+}
+
+/// Sets a property in this database.
+static bool account_db_txt_set_property(AccountDB* self, const char* key, const char* value)
+{
+	AccountDB_TXT* db = (AccountDB_TXT*)self;
+	const char* signature = "account.txt.";
+
+	if( strncmp(key, signature, strlen(signature)) != 0 )
+		return false;
+
+	key += strlen(signature);
+
+	if( strcmpi(key, "account_db") == 0 )
+		safestrncpy(db->account_db, value, sizeof(db->account_db));
+	else if( strcmpi(key, "case_sensitive") == 0 )
+		db->case_sensitive = config_switch(value);
+	else // no match
+		return false;
+
+	return true;
+}
+
+/// Add a new entry for this account to the account db and save it.
+/// If acc->account_id is -1, the account id will be auto-generated,
+/// and its value will be written to acc->account_id if everything succeeds.
+static bool account_db_txt_create(AccountDB* self, struct mmo_account* acc)
+{
+	AccountDB_TXT* db = (AccountDB_TXT*)self;
+	DBMap* accounts = db->accounts;
+	struct mmo_account* tmp;
+
+	// decide on the account id to assign
+	int account_id = ( acc->account_id != -1 ) ? acc->account_id : db->next_account_id;
+
+	// absolute maximum
+	if( account_id > END_ACCOUNT_NUM )
+		return false;
+
+	// check if the account_id is free
+	tmp = idb_get(accounts, account_id);
+	if( tmp != NULL )
+	{// error condition - entry already present
+		ShowError("account_db_txt_create: cannot create account %d:'%s', this id is already occupied by %d:'%s'!\n", account_id, acc->userid, account_id, tmp->userid);
+		return false;
+	}
+
+	// copy the data and store it in the db
+	CREATE(tmp, struct mmo_account, 1);
+	memcpy(tmp, acc, sizeof(struct mmo_account));
+	tmp->account_id = account_id;
+	idb_put(accounts, account_id, tmp);
+
+	// increment the auto_increment value
+	if( account_id >= db->next_account_id )
+		db->next_account_id = account_id + 1;
+
+	// flush data
+	mmo_auth_sync(db);
+
+	// write output
+	acc->account_id = account_id;
+
+	return true;
+}
+
+/// find an existing entry for this account id and delete it
+static bool account_db_txt_remove(AccountDB* self, const int account_id)
+{
+	AccountDB_TXT* db = (AccountDB_TXT*)self;
+	DBMap* accounts = db->accounts;
+
+	//TODO: find out if this really works
+	struct mmo_account* tmp = idb_remove(accounts, account_id);
+	if( tmp == NULL )
+	{// error condition - entry not present
+		ShowError("account_db_txt_remove: no such account with id %d\n", account_id);
+		return false;
+	}
+
+	// flush data
+	mmo_auth_sync(db);
+
+	return true;
+}
+
+/// rewrite the data stored in the account_db with the one provided
+static bool account_db_txt_save(AccountDB* self, const struct mmo_account* acc)
+{
+	AccountDB_TXT* db = (AccountDB_TXT*)self;
+	DBMap* accounts = db->accounts;
+	int account_id = acc->account_id;
+
+	// retrieve previous data
+	struct mmo_acount* tmp = idb_get(accounts, account_id);
+	if( tmp == NULL )
+	{// error condition - entry not found
+		return false;
+	}
+	
+	// overwrite with new data
+	memcpy(tmp, acc, sizeof(struct mmo_account));
+
+	// modify save counter and save if needed
+	if( --db->auths_before_save == 0 )
+		mmo_auth_sync(db);
+
+	return true;
+}
+
+/// retrieve data from db and store it in the provided data structure
+static bool account_db_txt_load_num(AccountDB* self, struct mmo_account* acc, const int account_id)
+{
+	AccountDB_TXT* db = (AccountDB_TXT*)self;
+	DBMap* accounts = db->accounts;
+
+	// retrieve data
+	struct mmo_account* tmp = idb_get(accounts, account_id);
+	if( tmp == NULL )
+	{// entry not found
+		return false;
+	}
+
+	// store it
+	memcpy(acc, tmp, sizeof(struct mmo_account));
+
+	return true;
+}
+
+/// retrieve data from db and store it in the provided data structure
+static bool account_db_txt_load_str(AccountDB* self, struct mmo_account* acc, const char* userid)
+{
+	AccountDB_TXT* db = (AccountDB_TXT*)self;
+	DBMap* accounts = db->accounts;
+
+	// retrieve data
+	struct DBIterator* iter = accounts->iterator(accounts);
+	struct mmo_account* tmp;
+	int (*compare)(const char* str1, const char* str2) = ( db->case_sensitive ) ? strcmp : stricmp;
+
+	for( tmp = (struct mmo_account*)iter->first(iter,NULL); iter->exists(iter); tmp = (struct mmo_account*)iter->next(iter,NULL) )
+		if( compare(userid, tmp->userid) == 0 )
+			break;
+	iter->destroy(iter);
+
+	if( tmp == NULL )
+	{// entry not found
+		return false;
+	}
+
+	// store it
+	memcpy(acc, tmp, sizeof(struct mmo_account));
+
+	return true;
+}
+
+
+/// Returns a new forward iterator.
+static AccountDBIterator* account_db_txt_iterator(AccountDB* self)
+{
+	AccountDB_TXT* db = (AccountDB_TXT*)self;
+	DBMap* accounts = db->accounts;
+	AccountDBIterator_TXT* iter = (AccountDBIterator_TXT*)aCalloc(1, sizeof(AccountDBIterator_TXT));
+
+	// set up the vtable
+	iter->vtable.destroy = &account_db_txt_iter_destroy;
+	iter->vtable.next    = &account_db_txt_iter_next;
+
+	// fill data
+	iter->iter = db_iterator(accounts);
+
+	return &iter->vtable;
+}
+
+
+/// Destroys this iterator, releasing all allocated memory (including itself).
+static void account_db_txt_iter_destroy(AccountDBIterator* self)
+{
+	AccountDBIterator_TXT* iter = (AccountDBIterator_TXT*)self;
+	dbi_destroy(iter->iter);
+	aFree(iter);
+}
+
+
+/// Fetches the next account in the database.
+static bool account_db_txt_iter_next(AccountDBIterator* self, struct mmo_account* acc)
+{
+	AccountDBIterator_TXT* iter = (AccountDBIterator_TXT*)self;
+	struct mmo_account* tmp = (struct mmo_account*)dbi_next(iter->iter);
+	if( dbi_exists(iter->iter) )
+	{
+		memcpy(acc, tmp, sizeof(struct mmo_account));
+		return true;
+	}
+	return false;
+}
+
+
+/// parse input string into the provided account data structure
+static bool mmo_auth_fromstr(struct mmo_account* a, char* str, unsigned int version)
+{
+	char* fields[32];
+	int count;
+	char* regs;
+	int i, n;
+
+	// zero out the destination first
+	memset(a, 0x00, sizeof(struct mmo_account));
+
+	// extract tab-separated columns from line
+	count = sv_split(str, strlen(str), 0, '\t', fields, ARRAYLENGTH(fields), SV_NOESCAPE_NOTERMINATE);
+
+	if( version == ACCOUNT_TXT_DB_VERSION && count == 13 )
+	{
+		a->account_id = strtol(fields[1], NULL, 10);
+		safestrncpy(a->userid, fields[2], sizeof(a->userid));
+		safestrncpy(a->pass, fields[3], sizeof(a->pass));
+		a->sex = fields[4][0];
+		safestrncpy(a->email, fields[5], sizeof(a->email));
+		a->level = strtoul(fields[6], NULL, 10);
+		a->state = strtoul(fields[7], NULL, 10);
+		a->unban_time = strtol(fields[8], NULL, 10);
+		a->expiration_time = strtol(fields[9], NULL, 10);
+		a->logincount = strtoul(fields[10], NULL, 10);
+		safestrncpy(a->lastlogin, fields[11], sizeof(a->lastlogin));
+		safestrncpy(a->last_ip, fields[12], sizeof(a->last_ip));
+		regs = fields[13];
+	}
+	else
+	if( version == 0 && count == 14 )
+	{
+		a->account_id = strtol(fields[1], NULL, 10);
+		safestrncpy(a->userid, fields[2], sizeof(a->userid));
+		safestrncpy(a->pass, fields[3], sizeof(a->pass));
+		safestrncpy(a->lastlogin, fields[4], sizeof(a->lastlogin));
+		a->sex = fields[5][0];
+		a->logincount = strtoul(fields[6], NULL, 10);
+		a->state = strtoul(fields[7], NULL, 10);
+		safestrncpy(a->email, fields[8], sizeof(a->email));
+		//safestrncpy(a->error_message, fields[9], sizeof(a->error_message));
+		a->expiration_time = strtol(fields[10], NULL, 10);
+		safestrncpy(a->last_ip, fields[11], sizeof(a->last_ip));
+		//safestrncpy(a->memo, fields[12], sizeof(a->memo));
+		a->unban_time = strtol(fields[13], NULL, 10);
+		regs = fields[14];
+	}
+	else
+	if( version == 0 && count == 13 )
+	{
+		a->account_id = strtol(fields[1], NULL, 10);
+		safestrncpy(a->userid, fields[2], sizeof(a->userid));
+		safestrncpy(a->pass, fields[3], sizeof(a->pass));
+		safestrncpy(a->lastlogin, fields[4], sizeof(a->lastlogin));
+		a->sex = fields[5][0];
+		a->logincount = strtoul(fields[6], NULL, 10);
+		a->state = strtoul(fields[7], NULL, 10);
+		safestrncpy(a->email, fields[8], sizeof(a->email));
+		//safestrncpy(a->error_message, fields[9], sizeof(a->error_message));
+		a->expiration_time = strtol(fields[10], NULL, 10);
+		safestrncpy(a->last_ip, fields[11], sizeof(a->last_ip));
+		//safestrncpy(a->memo, fields[12], sizeof(a->memo));
+		regs = fields[13];
+	}
+	else
+	if( version == 0 && count == 8 )
+	{
+		a->account_id = strtol(fields[1], NULL, 10);
+		safestrncpy(a->userid, fields[2], sizeof(a->userid));
+		safestrncpy(a->pass, fields[3], sizeof(a->pass));
+		safestrncpy(a->lastlogin, fields[4], sizeof(a->lastlogin));
+		a->sex = fields[5][0];
+		a->logincount = strtoul(fields[6], NULL, 10);
+		a->state = strtoul(fields[7], NULL, 10);
+		regs = fields[8];
+	}
+	else
+	{// unmatched row
+		return false;
+	}
+
+	// extract account regs
+	// {reg name<COMMA>reg value<SPACE>}*
+	n = 0;
+	for( i = 0; i < ACCOUNT_REG2_NUM; ++i )
+	{
+		char key[32];
+		char value[256];
+	
+		regs += n;
+
+		if (sscanf(regs, "%31[^\t,],%255[^\t ] %n", key, value, &n) != 2)
+		{
+			// We must check if a str is void. If it's, we can continue to read other REG2.
+			// Account line will have something like: str2,9 ,9 str3,1 (here, ,9 is not good)
+			if (regs[0] == ',' && sscanf(regs, ",%[^\t ] %n", value, &n) == 1) { 
+				i--;
+				continue;
+			} else
+				break;
+		}
+		
+		safestrncpy(a->account_reg2[i].str, key, 32);
+		safestrncpy(a->account_reg2[i].value, value, 256);
+	}
+	a->account_reg2_num = i;
+
+	return true;
+}
+
+/// dump the contents of the account data structure into the provided string buffer
+static bool mmo_auth_tostr(const struct mmo_account* a, char* str)
+{
+	int i;
+	char* str_p = str;
+
+	str_p += sprintf(str_p, "%d\t%s\t%s\t%c\t%s\t%u\t%u\t%ld\t%ld\t%u\t%s\t%s\t",
+	                 a->account_id, a->userid, a->pass, a->sex, a->email, a->level,
+	                 a->state, (long)a->unban_time, (long)a->expiration_time,
+	                 a->logincount, a->lastlogin, a->last_ip);
+
+	for( i = 0; i < a->account_reg2_num; ++i )
+		if( a->account_reg2[i].str[0] )
+			str_p += sprintf(str_p, "%s,%s ", a->account_reg2[i].str, a->account_reg2[i].value);
+
+	return true;
+}
+
+/// dump the entire account db to disk
+static void mmo_auth_sync(AccountDB_TXT* db)
+{
+	int lock;
+	FILE *fp;
+	struct DBIterator* iter;
+	struct mmo_account* acc;
+
+	fp = lock_fopen(db->account_db, &lock);
+	if( fp == NULL )
+	{
+		return;
+	}
+
+	fprintf(fp, "%d\n", ACCOUNT_TXT_DB_VERSION); // savefile version
+
+	fprintf(fp, "// Accounts file: here are saved all information about the accounts.\n");
+	fprintf(fp, "// Structure: account ID, username, password, sex, email, level, state, unban time, expiration time, # of logins, last login time, last (accepted) login ip, repeated(register key, register value)\n");
+	fprintf(fp, "// where:\n");
+	fprintf(fp, "//   sex             : M or F for normal accounts, S for server accounts\n");
+	fprintf(fp, "//   level           : this account's gm level\n");
+	fprintf(fp, "//   state           : 0: account is ok, 1 to 256: error code of packet 0x006a + 1\n");
+	fprintf(fp, "//   unban time      : 0: no ban, <other value>: banned until the date (unix timestamp)\n");
+	fprintf(fp, "//   expiration time : 0: unlimited account, <other value>: account expires on the date (unix timestamp)\n");
+
+	//TODO: sort?
+
+	iter = db->accounts->iterator(db->accounts);
+	for( acc = (struct mmo_account*)iter->first(iter,NULL); iter->exists(iter); acc = (struct mmo_account*)iter->next(iter,NULL) )
+	{
+		char buf[2048]; // ought to be big enough ^^
+		mmo_auth_tostr(acc, buf);
+		fprintf(fp, "%s\n", buf);
+	}
+	fprintf(fp, "%d\t%%newid%%\n", db->next_account_id);
+	iter->destroy(iter);
+
+	lock_fclose(fp, db->account_db, &lock);
+
+	// reset save counter
+	db->auths_before_save = AUTHS_BEFORE_SAVE;
+}
+
+static int mmo_auth_sync_timer(int tid, unsigned int tick, int id, intptr data)
+{
+	AccountDB_TXT* db = (AccountDB_TXT*)data;
+
+	if( db->auths_before_save < AUTHS_BEFORE_SAVE )
+		mmo_auth_sync(db); // db was modified, flush it
+
+	return 0;
+}
diff --git a/src/login/admin.c b/src/login/admin.c
index 9bce1a02f..c4116f16d 100644
--- a/src/login/admin.c
+++ b/src/login/admin.c
@@ -1,3 +1,6 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
 #include "../common/cbasetypes.h"
 #include "../common/mmo.h"
 #include "../common/core.h"
@@ -10,6 +13,7 @@
 #include "../common/version.h"
 #include "../common/md5calc.h"
 #include "../common/lock.h"
+#include "account.h"
 #include "login.h"
 
 #include <stdio.h>
@@ -17,31 +21,72 @@
 #include <string.h>
 #include <sys/stat.h> // for stat/lstat/fstat
 
-extern struct Login_Config login_config;
-
 #define MAX_SERVERS 30
 extern struct mmo_char_server server[MAX_SERVERS];
-extern struct mmo_account* auth_dat;
-extern uint32 auth_num;
-extern int account_id_count;
-extern char GM_account_filename[1024];
+extern AccountDB* accounts;
 
 int charif_sendallwos(int sfd, unsigned char *buf, unsigned int len);
-int search_account_index(char* account_name);
-int mmo_auth_new(struct mmo_account* account);
-void mmo_auth_sync(void);
-int mmo_auth_tostr(char* str, struct mmo_account* p);
-int read_gm_account(void);
-void send_GM_accounts(int fd);
-int isGM(int account_id);
+bool check_password(const char* md5key, int passwdenc, const char* passwd, const char* refpass);
+int mmo_auth_new(const char* userid, const char* pass, const char sex, const char* last_ip);
+int parse_admin(int fd);
+
+
+bool ladmin_auth(struct login_session_data* sd, const char* ip)
+{
+	bool result = false;
+
+	if( str2ip(ip) != host2ip(login_config.admin_allowed_host) )
+		ShowNotice("'ladmin'-login: Connection in administration mode REFUSED - IP isn't authorised (ip: %s).\n", ip);
+	else
+	if( !login_config.admin_state )
+		ShowNotice("'ladmin'-login: Connection in administration mode REFUSED - remote administration is disabled (ip: %s)\n", ip);
+	else
+	if( !check_password(sd->md5key, sd->passwdenc, sd->passwd, login_config.admin_pass) )
+		ShowNotice("'ladmin'-login: Connection in administration mode REFUSED - invalid password (ip: %s)\n", ip);
+	else
+	{
+		ShowNotice("'ladmin'-login: Connection in administration mode accepted (ip: %s)\n", ip);
+		session[sd->fd]->func_parse = parse_admin;
+		result = true;
+	}
+
+	return result;
+}
 
 //---------------------------------------
 // Packet parsing for administation login
+//
+// List of supported operations:
+// 0x7530 - request server version (response: 0x7531)
+// 0x7938 - request server list (response: 0x7939)
+// 0x7920 - request entire list of accounts (response: 0x7921)
+// 0x794e - request message broadcast (response: 0x794f + 0x2726)
+
+// 0x7930 - request account creation (response: 0x7931)
+// 0x7932 - request account deletion (response: 0x7933 + 0x2730)
+
+// 0x7934 - request account password modification (response: 0x7935)
+// 0x7936 - request account state modification (response: 0x7937 + 0x2731)
+// 0x793a - request password check (response: 0x793b)
+// 0x793c - request account sex modification (response: 0x793d + 0x2723)
+// 0x793e - request account gm-level modification (response: 0x793f)
+// 0x7940 - request account email modification (response: 0x7941)
+// 0x7942 - request account memo modification (response: 0x7943)
+// 0x7948 - request account expiration-time modification - absolute (response: 0x7949)
+// 0x7950 - request account expiration-time modification - relative (response: 0x7951)
+// 0x794a - request account unban-time modification - absolute (response: 0x794b + 0x2731)
+// 0x794c - request account unban-time modification - relative (response: 0x794d + 0x2731)
+
+// 0x7944 - request account id lookup by name (response: 0x7945)
+// 0x7946 - request account name lookup by id (response: 0x7947)
+// 0x7952 - request account information lookup by name (response: 0x7953)
+// 0x7954 - request account information lookup by id (response: 0x7953)
 //---------------------------------------
 int parse_admin(int fd)
 {
 	unsigned int i, j;
 	char* account_name;
+	struct mmo_account acc;
 
 	uint32 ipl = session[fd]->client_addr;
 	char ip[16];
@@ -75,7 +120,7 @@ int parse_admin(int fd)
 			WFIFOSET(fd,10);
 			RFIFOSKIP(fd,2);
 			break;
-
+/*
 		case 0x7920:	// Request of an accounts list
 			if (RFIFOREST(fd) < 10)
 				return 0;
@@ -130,158 +175,145 @@ int parse_admin(int fd)
 				DELETE_BUFFER(id);
 			}
 			break;
-
+*/
 		case 0x7930:	// Request for an account creation
 			if (RFIFOREST(fd) < 91)
 				return 0;
-			{
-				struct mmo_account ma;
-				safestrncpy(ma.userid, (char*)RFIFOP(fd, 2), NAME_LENGTH);
-				safestrncpy(ma.pass,   (char*)RFIFOP(fd,26), NAME_LENGTH);
-				safestrncpy(ma.email,  (char*)RFIFOP(fd,51), 40);
-				memcpy(ma.lastlogin, "-", 2);
-				ma.sex = RFIFOB(fd,50);
-				RFIFOSKIP(fd,91);
-
-				WFIFOW(fd,0) = 0x7931;
-				WFIFOL(fd,2) = 0xffffffff; // invalid account id
-				safestrncpy((char*)WFIFOP(fd,6), ma.userid, 24);
-				if (strlen(ma.userid) < 4 || strlen(ma.pass) < 4) {
-					ShowNotice("'ladmin': Attempt to create an invalid account (account or pass is too short, ip: %s)\n", ip);
-				} else if (ma.sex != 'F' && ma.sex != 'M') {
-					ShowNotice("'ladmin': Attempt to create an invalid account (account: %s, received pass: %s, invalid sex, ip: %s)\n", ma.userid, ma.pass, ip);
-				} else if (account_id_count > END_ACCOUNT_NUM) {
-					ShowNotice("'ladmin': Attempt to create an account, but there is no more available id number (account: %s, pass: %s, sex: %c, ip: %s)\n", ma.userid, ma.pass, ma.sex, ip);
-				} else {
-					remove_control_chars(ma.userid);
-					remove_control_chars(ma.pass);
-					remove_control_chars(ma.email);
-					ARR_FIND( 0, auth_num, i, strncmp(auth_dat[i].userid, ma.userid, 24) == 0 );
-					if( i < auth_num )
-						ShowNotice("'ladmin': Attempt to create an already existing account (account: %s, pass: %s, received pass: %s, ip: %s)\n", auth_dat[i].userid, auth_dat[i].pass, ma.pass, ip);
-					else
-					{
-						int new_id;
-						new_id = mmo_auth_new(&ma);
-						ShowNotice("'ladmin': Account creation (account: %s (id: %d), pass: %s, sex: %c, email: %s, ip: %s)\n", ma.userid, new_id, ma.pass, ma.sex, auth_dat[i].email, ip);
-						WFIFOL(fd,2) = new_id;
-						mmo_auth_sync();
-					}
-				}
-				WFIFOSET(fd,30);
-			}
+		{
+			struct mmo_account ma;
+			safestrncpy(ma.userid, (char*)RFIFOP(fd, 2), sizeof(ma.userid));
+			safestrncpy(ma.pass, (char*)RFIFOP(fd,26), sizeof(ma.pass));
+			ma.sex = RFIFOB(fd,50);
+			safestrncpy(ma.email, (char*)RFIFOP(fd,51), sizeof(ma.email));
+			safestrncpy(ma.lastlogin, "-", sizeof(ma.lastlogin));
+
+			ShowNotice("'ladmin': Account creation request (account: %s pass: %s, sex: %c, email: %s, ip: %s)\n", ma.userid, ma.pass, ma.sex, ma.email, ip);
+
+			WFIFOW(fd,0) = 0x7931;
+			WFIFOL(fd,2) = mmo_auth_new(ma.userid, ma.pass, ma.sex, ip);
+			safestrncpy((char*)WFIFOP(fd,6), ma.userid, 24);
+			WFIFOSET(fd,30);
+		}
+			RFIFOSKIP(fd,91);
 			break;
-
+/*
 		case 0x7932:	// Request for an account deletion
 			if (RFIFOREST(fd) < 26)
 				return 0;
-			WFIFOW(fd,0) = 0x7933;
-			WFIFOL(fd,2) = 0xFFFFFFFF;
-			account_name = (char*)RFIFOP(fd,2);
+		{
+			struct mmo_account acc;
+
+			char* account_name = (char*)RFIFOP(fd,2);
 			account_name[23] = '\0';
-			remove_control_chars(account_name);
-			i = search_account_index(account_name);
-			if (i != -1) {
+
+			WFIFOW(fd,0) = 0x7933;
+
+			if( accounts->load_str(accounts, &acc, account_name) )
+			{
 				// Char-server is notified of deletion (for characters deletion).
 				unsigned char buf[65535];
 				WBUFW(buf,0) = 0x2730;
-				WBUFL(buf,2) = auth_dat[i].account_id;
+				WBUFL(buf,2) = acc.account_id;
 				charif_sendallwos(-1, buf, 6);
+
 				// send answer
-				memcpy(WFIFOP(fd,6), auth_dat[i].userid, 24);
-				WFIFOL(fd,2) = auth_dat[i].account_id;
-				// save deleted account in log file
-				ShowNotice("'ladmin': Account deletion (account: %s, id: %d, ip: %s) - saved in next line:\n", auth_dat[i].userid, auth_dat[i].account_id, ip);
-				mmo_auth_tostr((char*)buf, &auth_dat[i]);
-				ShowNotice("%s\n", buf);
+				memcpy(WFIFOP(fd,6), acc.userid, 24);
+				WFIFOL(fd,2) = acc.account_id;
+
 				// delete account
-				memset(auth_dat[i].userid, '\0', sizeof(auth_dat[i].userid));
+				memset(acc.userid, '\0', sizeof(acc.userid));
 				auth_dat[i].account_id = -1;
 				mmo_auth_sync();
 			} else {
+				WFIFOL(fd,2) = -1;
 				memcpy(WFIFOP(fd,6), account_name, 24);
 				ShowNotice("'ladmin': Attempt to delete an unknown account (account: %s, ip: %s)\n", account_name, ip);
 			}
 			WFIFOSET(fd,30);
+		}
 			RFIFOSKIP(fd,26);
 			break;
-
+*/
 		case 0x7934:	// Request to change a password
 			if (RFIFOREST(fd) < 50)
 				return 0;
-			WFIFOW(fd,0) = 0x7935;
-			WFIFOL(fd,2) = 0xFFFFFFFF; /// WTF??? an unsigned being set to a -1
-			account_name = (char*)RFIFOP(fd,2);
+		{
+			struct mmo_account acc;
+
+			char* account_name = (char*)RFIFOP(fd,2);
 			account_name[23] = '\0';
-			remove_control_chars(account_name);
-			i = search_account_index(account_name);
-			if (i != -1) {
-				memcpy(WFIFOP(fd,6), auth_dat[i].userid, 24);
-				memcpy(auth_dat[i].pass, RFIFOP(fd,26), 24);
-				auth_dat[i].pass[23] = '\0';
-				remove_control_chars(auth_dat[i].pass);
-				WFIFOL(fd,2) = auth_dat[i].account_id;
-				ShowNotice("'ladmin': Modification of a password (account: %s, new password: %s, ip: %s)\n", auth_dat[i].userid, auth_dat[i].pass, ip);
-				mmo_auth_sync();
-			} else {
-				memcpy(WFIFOP(fd,6), account_name, 24);
+
+			WFIFOW(fd,0) = 0x7935;
+
+			if( accounts->load_str(accounts, &acc, account_name) )
+			{
+				WFIFOL(fd,2) = acc.account_id;
+				safestrncpy((char*)WFIFOP(fd,6), acc.userid, 24);
+				safestrncpy(acc.pass, (char*)RFIFOP(fd,26), 24);
+				ShowNotice("'ladmin': Modification of a password (account: %s, new password: %s, ip: %s)\n", acc.userid, acc.pass, ip);
+
+				accounts->save(accounts, &acc);
+			}
+			else
+			{
+				WFIFOL(fd,2) = -1;
+				safestrncpy((char*)WFIFOP(fd,6), account_name, 24);
 				ShowNotice("'ladmin': Attempt to modify the password of an unknown account (account: %s, ip: %s)\n", account_name, ip);
 			}
+
 			WFIFOSET(fd,30);
+		}
 			RFIFOSKIP(fd,50);
 			break;
 
 		case 0x7936:	// Request to modify a state
 			if (RFIFOREST(fd) < 50)
 				return 0;
+		{
+			struct mmo_account acc;
+
+			char* account_name = (char*)RFIFOP(fd,2);
+			uint32 state = RFIFOL(fd,26);
+			account_name[23] = '\0';
+
+			WFIFOW(fd,0) = 0x7937;
+
+			if( accounts->load_str(accounts, &acc, account_name) )
 			{
-				char error_message[20];
-				uint32 statut;
-				WFIFOW(fd,0) = 0x7937;
-				WFIFOL(fd,2) = 0xFFFFFFFF; // WTF???
-				account_name = (char*)RFIFOP(fd,2);
-				account_name[23] = '\0';
-				remove_control_chars(account_name);
-				statut = RFIFOL(fd,26);
-				memcpy(error_message, RFIFOP(fd,30), 20);
-				error_message[19] = '\0';
-				remove_control_chars(error_message);
-				if (statut != 7 || error_message[0] == '\0') { // 7: // 6 = Your are Prohibited to log in until %s
-					strcpy(error_message, "-");
-				}
-				i = search_account_index(account_name);
-				if (i != -1) {
-					memcpy(WFIFOP(fd,6), auth_dat[i].userid, 24);
-					WFIFOL(fd,2) = auth_dat[i].account_id;
-					if (auth_dat[i].state == statut && strcmp(auth_dat[i].error_message, error_message) == 0)
-						ShowNotice("'ladmin': Modification of a state, but the state of the account is already the good state (account: %s, received state: %d, ip: %s)\n", account_name, statut, ip);
-					else {
-						if (statut == 7)
-							ShowNotice("'ladmin': Modification of a state (account: %s, new state: %d - prohibited to login until '%s', ip: %s)\n", auth_dat[i].userid, statut, error_message, ip);
-						else
-							ShowNotice("'ladmin': Modification of a state (account: %s, new state: %d, ip: %s)\n", auth_dat[i].userid, statut, ip);
-						if (auth_dat[i].state == 0) {
-							unsigned char buf[16];
-							WBUFW(buf,0) = 0x2731;
-							WBUFL(buf,2) = auth_dat[i].account_id;
-							WBUFB(buf,6) = 0; // 0: change of statut, 1: ban
-							WBUFL(buf,7) = statut; // status or final date of a banishment
-							charif_sendallwos(-1, buf, 11);
-						}
-						auth_dat[i].state = statut;
-						memcpy(auth_dat[i].error_message, error_message, 20);
-						mmo_auth_sync();
+				memcpy(WFIFOP(fd,6), acc.userid, 24);
+				WFIFOL(fd,2) = acc.account_id;
+
+				if (acc.state == state)
+					ShowNotice("'ladmin': Modification of a state, but the state of the account already has this value (account: %s, received state: %d, ip: %s)\n", account_name, state, ip);
+				else
+				{
+					ShowNotice("'ladmin': Modification of a state (account: %s, new state: %d, ip: %s)\n", acc.userid, state, ip);
+
+					if (acc.state == 0) {
+						unsigned char buf[16];
+						WBUFW(buf,0) = 0x2731;
+						WBUFL(buf,2) = acc.account_id;
+						WBUFB(buf,6) = 0; // 0: change of statut, 1: ban
+						WBUFL(buf,7) = state; // status or final date of a banishment
+						charif_sendallwos(-1, buf, 11);
 					}
-				} else {
-					memcpy(WFIFOP(fd,6), account_name, 24);
-					ShowNotice("'ladmin': Attempt to modify the state of an unknown account (account: %s, received state: %d, ip: %s)\n", account_name, statut, ip);
+					acc.state = state;
+					accounts->save(accounts, &acc);
 				}
-				WFIFOL(fd,30) = statut;
 			}
+			else
+			{
+				ShowNotice("'ladmin': Attempt to modify the state of an unknown account (account: %s, received state: %d, ip: %s)\n", account_name, state, ip);
+				WFIFOL(fd,2) = -1;
+				memcpy(WFIFOP(fd,6), account_name, 24);
+			}
+
+			WFIFOL(fd,30) = state;
 			WFIFOSET(fd,34);
+		}
 			RFIFOSKIP(fd,50);
 			break;
-
+/*
 		case 0x7938:	// Request for servers list and # of online players
 		{		
 			uint8 server_num = 0;
@@ -312,18 +344,18 @@ int parse_admin(int fd)
 			account_name = (char*)RFIFOP(fd,2);
 			account_name[23] = '\0';
 			remove_control_chars(account_name);
-			i = search_account_index(account_name);
-			if (i != -1) {
+			if( accounts->load_str(accounts, &acc, account_name) )
+			{
 				char pass[25];
 				memcpy(WFIFOP(fd,6), auth_dat[i].userid, 24);
 				memcpy(pass, RFIFOP(fd,26), 24);
 				pass[24] = '\0';
 				remove_control_chars(pass);
-				if (strcmp(auth_dat[i].pass, pass) == 0) {
-					WFIFOL(fd,2) = auth_dat[i].account_id;
-					ShowNotice("'ladmin': Check of password OK (account: %s, password: %s, ip: %s)\n", auth_dat[i].userid, auth_dat[i].pass, ip);
+				if (strcmp(acc.pass, pass) == 0) {
+					WFIFOL(fd,2) = acc.account_id;
+					ShowNotice("'ladmin': Check of password OK (account: %s, password: %s, ip: %s)\n", acc.userid, acc.pass, ip);
 				} else {
-					ShowNotice("'ladmin': Failure of password check (account: %s, proposed pass: %s, ip: %s)\n", auth_dat[i].userid, pass, ip);
+					ShowNotice("'ladmin': Failure of password check (account: %s, proposed pass: %s, ip: %s)\n", acc.userid, pass, ip);
 				}
 			} else {
 				memcpy(WFIFOP(fd,6), account_name, 24);
@@ -337,7 +369,7 @@ int parse_admin(int fd)
 			if (RFIFOREST(fd) < 27)
 				return 0;
 			WFIFOW(fd,0) = 0x793d;
-			WFIFOL(fd,2) = 0xFFFFFFFF; // WTF???
+			WFIFOL(fd,2) = 0xFFFFFFFF; // -1
 			account_name = (char*)RFIFOP(fd,2);
 			account_name[23] = '\0';
 			remove_control_chars(account_name);
@@ -351,22 +383,25 @@ int parse_admin(int fd)
 					else
 						ShowNotice("'ladmin': Attempt to give an invalid sex (account: %s, received sex: 'control char', ip: %s)\n", account_name, ip);
 				} else {
-					i = search_account_index(account_name);
-					if (i != -1) {
-						memcpy(WFIFOP(fd,6), auth_dat[i].userid, 24);
-						if (auth_dat[i].sex != ((sex == 'S' || sex == 's') ? 2 : (sex == 'M' || sex == 'm'))) {
+					if( accounts->load_str(accounts, &acc, account_name) )
+					{
+						memcpy(WFIFOP(fd,6), acc.userid, 24);
+						if (acc.sex != sex)
+						{
 							unsigned char buf[16];
-							WFIFOL(fd,2) = auth_dat[i].account_id;
-							auth_dat[i].sex = (sex == 'S' || sex == 's') ? 2 : (sex == 'M' || sex == 'm');
-							ShowNotice("'ladmin': Modification of a sex (account: %s, new sex: %c, ip: %s)\n", auth_dat[i].userid, sex, ip);
-							mmo_auth_sync();
+							ShowNotice("'ladmin': Modification of a sex (account: %s, new sex: %c, ip: %s)\n", acc.userid, sex, ip);
+
+							WFIFOL(fd,2) = acc.account_id;
+							acc.sex = sex;
+							accounts->save(accounts, &acc);
+
 							// send to all char-server the change
 							WBUFW(buf,0) = 0x2723;
-							WBUFL(buf,2) = auth_dat[i].account_id;
-							WBUFB(buf,6) = auth_dat[i].sex;
+							WBUFL(buf,2) = acc.account_id;
+							WBUFB(buf,6) = acc.sex;
 							charif_sendallwos(-1, buf, 7);
 						} else {
-							ShowNotice("'ladmin': Modification of a sex, but the sex is already the good sex (account: %s, sex: %c, ip: %s)\n", auth_dat[i].userid, sex, ip);
+							ShowNotice("'ladmin': Modification of a sex, but the sex is already the good sex (account: %s, sex: %c, ip: %s)\n", acc.userid, sex, ip);
 						}
 					} else {
 						ShowNotice("'ladmin': Attempt to modify the sex of an unknown account (account: %s, received sex: %c, ip: %s)\n", account_name, sex, ip);
@@ -381,82 +416,31 @@ int parse_admin(int fd)
 			if (RFIFOREST(fd) < 27)
 				return 0;
 			WFIFOW(fd,0) = 0x793f;
-			WFIFOL(fd,2) = 0xFFFFFFFF; // WTF???
+			WFIFOL(fd,2) = 0xFFFFFFFF; // -1
 			account_name = (char*)RFIFOP(fd,2);
 			account_name[23] = '\0';
 			remove_control_chars(account_name);
 			memcpy(WFIFOP(fd,6), account_name, 24);
+		{
+			char new_gm_level;
+			new_gm_level = RFIFOB(fd,26);
+			if( new_gm_level < 0 || new_gm_level > 99 )
+				ShowNotice("'ladmin': Attempt to give an invalid GM level (account: %s, received GM level: %d, ip: %s)\n", account_name, (int)new_gm_level, ip);
+			else
+			if( !accounts->load_str(accounts, &acc, account_name) )
+				ShowNotice("'ladmin': Attempt to modify the GM level of an unknown account (account: %s, received GM level: %d, ip: %s)\n", account_name, (int)new_gm_level, ip);
+			else
 			{
-				char new_gm_level;
-				new_gm_level = RFIFOB(fd,26);
-				if (new_gm_level < 0 || new_gm_level > 99) {
-					ShowNotice("'ladmin': Attempt to give an invalid GM level (account: %s, received GM level: %d, ip: %s)\n", account_name, (int)new_gm_level, ip);
-				} else {
-					i = search_account_index(account_name);
-					if (i != -1) {
-						int acc = auth_dat[i].account_id;
-						memcpy(WFIFOP(fd,6), auth_dat[i].userid, 24);
-						if (isGM(acc) != new_gm_level) {
-							// modification of the file
-							FILE *fp, *fp2;
-							int lock;
-							char line[512];
-							int GM_account, GM_level;
-							int modify_flag;
-							char tmpstr[24];
-							time_t raw_time;
-							if ((fp2 = lock_fopen(GM_account_filename, &lock)) != NULL) {
-								if ((fp = fopen(GM_account_filename, "r")) != NULL) {
-									time(&raw_time);
-									strftime(tmpstr, 23, login_config.date_format, localtime(&raw_time));
-									modify_flag = 0;
-									// read/write GM file
-									while(fgets(line, sizeof(line), fp))
-									{
-										while(line[0] != '\0' && (line[strlen(line)-1] == '\n' || line[strlen(line)-1] == '\r'))
-											line[strlen(line)-1] = '\0'; // TODO: remove this
-										if ((line[0] == '/' && line[1] == '/') || line[0] == '\0')
-											fprintf(fp2, "%s\n", line);
-										else {
-											if (sscanf(line, "%d %d", &GM_account, &GM_level) != 2 && sscanf(line, "%d: %d", &GM_account, &GM_level) != 2)
-												fprintf(fp2, "%s\n", line);
-											else if (GM_account != acc)
-												fprintf(fp2, "%s\n", line);
-											else if (new_gm_level < 1) {
-												fprintf(fp2, "// %s: 'ladmin' GM level removed on account %d '%s' (previous level: %d)\n//%d %d\n", tmpstr, acc, auth_dat[i].userid, GM_level, acc, new_gm_level);
-												modify_flag = 1;
-											} else {
-												fprintf(fp2, "// %s: 'ladmin' GM level on account %d '%s' (previous level: %d)\n%d %d\n", tmpstr, acc, auth_dat[i].userid, GM_level, acc, new_gm_level);
-												modify_flag = 1;
-											}
-										}
-									}
-									if (modify_flag == 0)
-										fprintf(fp2, "// %s: 'ladmin' GM level on account %d '%s' (previous level: 0)\n%d %d\n", tmpstr, acc, auth_dat[i].userid, acc, new_gm_level);
-									fclose(fp);
-								} else {
-									ShowNotice("'ladmin': Attempt to modify of a GM level - impossible to read GM accounts file (account: %s (%d), received GM level: %d, ip: %s)\n", auth_dat[i].userid, acc, (int)new_gm_level, ip);
-								}
-								if (lock_fclose(fp2, GM_account_filename, &lock) == 0) {
-									WFIFOL(fd,2) = acc;
-									ShowNotice("'ladmin': Modification of a GM level (account: %s (%d), new GM level: %d, ip: %s)\n", auth_dat[i].userid, acc, (int)new_gm_level, ip);
-									// read and send new GM informations
-									read_gm_account();
-									send_GM_accounts(-1);
-								} else {
-									ShowNotice("'ladmin': Attempt to modify of a GM level - impossible to write GM accounts file (account: %s (%d), received GM level: %d, ip: %s)\n", auth_dat[i].userid, acc, (int)new_gm_level, ip);
-								}
-							} else {
-								ShowNotice("'ladmin': Attempt to modify of a GM level - impossible to write GM accounts file (account: %s (%d), received GM level: %d, ip: %s)\n", auth_dat[i].userid, acc, (int)new_gm_level, ip);
-							}
-						} else {
-							ShowNotice("'ladmin': Attempt to modify of a GM level, but the GM level is already the good GM level (account: %s (%d), GM level: %d, ip: %s)\n", auth_dat[i].userid, acc, (int)new_gm_level, ip);
-						}
-					} else {
-						ShowNotice("'ladmin': Attempt to modify the GM level of an unknown account (account: %s, received GM level: %d, ip: %s)\n", account_name, (int)new_gm_level, ip);
-					}
+				memcpy(WFIFOP(fd,6), acc.userid, 24);
+
+				if (isGM(acc.account_id) == new_gm_level)
+					ShowNotice("'ladmin': Attempt to modify of a GM level, but the GM level is already the good GM level (account: %s (%d), GM level: %d, ip: %s)\n", acc.userid, acc.account_id, (int)new_gm_level, ip);
+				else
+				{
+					//TODO: change level
 				}
 			}
+		}
 			WFIFOSET(fd,30);
 			RFIFOSKIP(fd,27);
 			break;
@@ -739,133 +723,131 @@ int parse_admin(int fd)
 		case 0x7950:	// Request to change the validity limite (timestamp) (relative change)
 			if (RFIFOREST(fd) < 38)
 				return 0;
-			{
-				time_t timestamp;
-				struct tm *tmtime;
-				char tmpstr[2048];
-				char tmpstr2[2048];
-				WFIFOW(fd,0) = 0x7951;
-				WFIFOL(fd,2) = 0xFFFFFFFF; // WTF???
-				account_name = (char*)RFIFOP(fd,2);
-				account_name[23] = '\0';
-				remove_control_chars(account_name);
-				i = search_account_index(account_name);
-				if (i != -1) {
-					WFIFOL(fd,2) = auth_dat[i].account_id;
-					memcpy(WFIFOP(fd,6), auth_dat[i].userid, 24);
-					timestamp = auth_dat[i].expiration_time;
-					if (timestamp == 0 || timestamp < time(NULL))
-						timestamp = time(NULL);
-					tmtime = localtime(&timestamp);
-					tmtime->tm_year = tmtime->tm_year + (short)RFIFOW(fd,26);
-					tmtime->tm_mon = tmtime->tm_mon + (short)RFIFOW(fd,28);
-					tmtime->tm_mday = tmtime->tm_mday + (short)RFIFOW(fd,30);
-					tmtime->tm_hour = tmtime->tm_hour + (short)RFIFOW(fd,32);
-					tmtime->tm_min = tmtime->tm_min + (short)RFIFOW(fd,34);
-					tmtime->tm_sec = tmtime->tm_sec + (short)RFIFOW(fd,36);
-					timestamp = mktime(tmtime);
-					if (timestamp != -1) {
-						strftime(tmpstr, 24, login_config.date_format, localtime(&auth_dat[i].expiration_time));
-						strftime(tmpstr2, 24, login_config.date_format, localtime(&timestamp));
-						ShowNotice("'ladmin': Adjustment of a validity limit (account: %s, %d (%s) + (%+d y %+d m %+d d %+d h %+d mn %+d s) -> new validity: %d (%s), ip: %s)\n", auth_dat[i].userid, auth_dat[i].expiration_time, (auth_dat[i].expiration_time == 0 ? "unlimited" : tmpstr), (short)RFIFOW(fd,26), (short)RFIFOW(fd,28), (short)RFIFOW(fd,30), (short)RFIFOW(fd,32), (short)RFIFOW(fd,34), (short)RFIFOW(fd,36), timestamp, (timestamp == 0 ? "unlimited" : tmpstr2), ip);
-						auth_dat[i].expiration_time = timestamp;
-						mmo_auth_sync();
-						WFIFOL(fd,30) = (unsigned long)auth_dat[i].expiration_time;
-					} else {
-						strftime(tmpstr, 24, login_config.date_format, localtime(&auth_dat[i].expiration_time));
-						ShowNotice("'ladmin': Impossible to adjust a validity limit (account: %s, %d (%s) + (%+d y %+d m %+d d %+d h %+d mn %+d s) -> ???, ip: %s)\n", auth_dat[i].userid, auth_dat[i].expiration_time, (auth_dat[i].expiration_time == 0 ? "unlimited" : tmpstr), (short)RFIFOW(fd,26), (short)RFIFOW(fd,28), (short)RFIFOW(fd,30), (short)RFIFOW(fd,32), (short)RFIFOW(fd,34), (short)RFIFOW(fd,36), ip);
-						WFIFOL(fd,30) = 0;
-					}
+		{
+			time_t timestamp;
+			struct tm *tmtime;
+			char tmpstr[2048];
+			char tmpstr2[2048];
+			WFIFOW(fd,0) = 0x7951;
+			WFIFOL(fd,2) = 0xFFFFFFFF; // WTF???
+			account_name = (char*)RFIFOP(fd,2);
+			account_name[23] = '\0';
+			remove_control_chars(account_name);
+			i = search_account_index(account_name);
+			if (i != -1) {
+				WFIFOL(fd,2) = auth_dat[i].account_id;
+				memcpy(WFIFOP(fd,6), auth_dat[i].userid, 24);
+				timestamp = auth_dat[i].expiration_time;
+				if (timestamp == 0 || timestamp < time(NULL))
+					timestamp = time(NULL);
+				tmtime = localtime(&timestamp);
+				tmtime->tm_year = tmtime->tm_year + (short)RFIFOW(fd,26);
+				tmtime->tm_mon = tmtime->tm_mon + (short)RFIFOW(fd,28);
+				tmtime->tm_mday = tmtime->tm_mday + (short)RFIFOW(fd,30);
+				tmtime->tm_hour = tmtime->tm_hour + (short)RFIFOW(fd,32);
+				tmtime->tm_min = tmtime->tm_min + (short)RFIFOW(fd,34);
+				tmtime->tm_sec = tmtime->tm_sec + (short)RFIFOW(fd,36);
+				timestamp = mktime(tmtime);
+				if (timestamp != -1) {
+					strftime(tmpstr, 24, login_config.date_format, localtime(&auth_dat[i].expiration_time));
+					strftime(tmpstr2, 24, login_config.date_format, localtime(&timestamp));
+					ShowNotice("'ladmin': Adjustment of a validity limit (account: %s, %d (%s) + (%+d y %+d m %+d d %+d h %+d mn %+d s) -> new validity: %d (%s), ip: %s)\n", auth_dat[i].userid, auth_dat[i].expiration_time, (auth_dat[i].expiration_time == 0 ? "unlimited" : tmpstr), (short)RFIFOW(fd,26), (short)RFIFOW(fd,28), (short)RFIFOW(fd,30), (short)RFIFOW(fd,32), (short)RFIFOW(fd,34), (short)RFIFOW(fd,36), timestamp, (timestamp == 0 ? "unlimited" : tmpstr2), ip);
+					auth_dat[i].expiration_time = timestamp;
+					mmo_auth_sync();
+					WFIFOL(fd,30) = (unsigned long)auth_dat[i].expiration_time;
 				} else {
-					memcpy(WFIFOP(fd,6), account_name, 24);
-					ShowNotice("'ladmin': Attempt to adjust the validity limit of an unknown account (account: %s, ip: %s)\n", account_name, ip);
+					strftime(tmpstr, 24, login_config.date_format, localtime(&auth_dat[i].expiration_time));
+					ShowNotice("'ladmin': Impossible to adjust a validity limit (account: %s, %d (%s) + (%+d y %+d m %+d d %+d h %+d mn %+d s) -> ???, ip: %s)\n", auth_dat[i].userid, auth_dat[i].expiration_time, (auth_dat[i].expiration_time == 0 ? "unlimited" : tmpstr), (short)RFIFOW(fd,26), (short)RFIFOW(fd,28), (short)RFIFOW(fd,30), (short)RFIFOW(fd,32), (short)RFIFOW(fd,34), (short)RFIFOW(fd,36), ip);
 					WFIFOL(fd,30) = 0;
 				}
+			} else {
+				memcpy(WFIFOP(fd,6), account_name, 24);
+				ShowNotice("'ladmin': Attempt to adjust the validity limit of an unknown account (account: %s, ip: %s)\n", account_name, ip);
+				WFIFOL(fd,30) = 0;
 			}
+
 			WFIFOSET(fd,34);
+		}
 			RFIFOSKIP(fd,38);
 			break;
-
+*/
 		case 0x7952:	// Request about informations of an account (by account name)
 			if (RFIFOREST(fd) < 26)
 				return 0;
+		{
+			struct mmo_account acc;
+
 			WFIFOW(fd,0) = 0x7953;
-			WFIFOL(fd,2) = 0xFFFFFFFF; // WTF???
+
 			account_name = (char*)RFIFOP(fd,2);
 			account_name[23] = '\0';
-			remove_control_chars(account_name);
-			i = search_account_index(account_name);
-			if (i != -1) {
-				WFIFOL(fd,2) = auth_dat[i].account_id;
-				WFIFOB(fd,6) = (unsigned char)isGM(auth_dat[i].account_id);
-				memcpy(WFIFOP(fd,7), auth_dat[i].userid, 24);
-				WFIFOB(fd,31) = auth_dat[i].sex;
-				WFIFOL(fd,32) = auth_dat[i].logincount;
-				WFIFOL(fd,36) = auth_dat[i].state;
-				memcpy(WFIFOP(fd,40), auth_dat[i].error_message, 20);
-				memcpy(WFIFOP(fd,60), auth_dat[i].lastlogin, 24);
-				memcpy(WFIFOP(fd,84), auth_dat[i].last_ip, 16);
-				memcpy(WFIFOP(fd,100), auth_dat[i].email, 40);
-				WFIFOL(fd,140) = (unsigned long)auth_dat[i].expiration_time;
-				WFIFOL(fd,144) = (unsigned long)auth_dat[i].unban_time;
-				WFIFOW(fd,148) = (uint16)strlen(auth_dat[i].memo);
-				if (auth_dat[i].memo[0]) {
-					memcpy(WFIFOP(fd,150), auth_dat[i].memo, strlen(auth_dat[i].memo));
-				}
-				ShowNotice("'ladmin': Sending information of an account (request by the name; account: %s, id: %d, ip: %s)\n", auth_dat[i].userid, auth_dat[i].account_id, ip);
-				WFIFOSET(fd,150+strlen(auth_dat[i].memo));
-			} else {
-				memcpy(WFIFOP(fd,7), account_name, 24);
-				WFIFOW(fd,148) = 0;
+
+			if( accounts->load_str(accounts, &acc, account_name) )
+			{
+				ShowNotice("'ladmin': Sending information of an account (request by the name; account: %s, id: %d, ip: %s)\n", acc.userid, acc.account_id, ip);
+				WFIFOL(fd,2) = acc.account_id;
+				WFIFOB(fd,6) = acc.level;
+				safestrncpy((char*)WFIFOP(fd,7), acc.userid, 24);
+				WFIFOB(fd,31) = acc.sex;
+				WFIFOL(fd,32) = acc.logincount;
+				WFIFOL(fd,36) = acc.state;
+				safestrncpy((char*)WFIFOP(fd,40), "-", 20); // error message (removed)
+				safestrncpy((char*)WFIFOP(fd,60), acc.lastlogin, 24);
+				safestrncpy((char*)WFIFOP(fd,84), acc.last_ip, 16);
+				safestrncpy((char*)WFIFOP(fd,100), acc.email, 40);
+				WFIFOL(fd,140) = (unsigned long)acc.expiration_time;
+				WFIFOL(fd,144) = (unsigned long)acc.unban_time;
+				WFIFOW(fd,148) = 0; // previously, this was strlen(memo), and memo went afterwards
+			}
+			else
+			{
 				ShowNotice("'ladmin': Attempt to obtain information (by the name) of an unknown account (account: %s, ip: %s)\n", account_name, ip);
-				WFIFOSET(fd,150);
+				WFIFOL(fd,2) = -1;
+				safestrncpy((char*)WFIFOP(fd,7), account_name, 24); // not found
 			}
+
+			WFIFOSET(fd,150);
+		}
 			RFIFOSKIP(fd,26);
 			break;
 
 		case 0x7954:	// Request about information of an account (by account id)
 			if (RFIFOREST(fd) < 6)
 				return 0;
+		{
+			struct mmo_account acc;
+
+			int account_id = RFIFOL(fd,2);
+
+			WFIFOHEAD(fd,150);
 			WFIFOW(fd,0) = 0x7953;
-			WFIFOL(fd,2) = RFIFOL(fd,2);
-			memset(WFIFOP(fd,7), '\0', 24);
-			for(i = 0; i < auth_num; i++) {
-				if (auth_dat[i].account_id == (int)RFIFOL(fd,2)) {
-					ShowNotice("'ladmin': Sending information of an account (request by the id; account: %s, id: %d, ip: %s)\n", auth_dat[i].userid, RFIFOL(fd,2), ip);
-					WFIFOB(fd,6) = (unsigned char)isGM(auth_dat[i].account_id);
-					memcpy(WFIFOP(fd,7), auth_dat[i].userid, 24);
-					WFIFOB(fd,31) = auth_dat[i].sex;
-					WFIFOL(fd,32) = auth_dat[i].logincount;
-					WFIFOL(fd,36) = auth_dat[i].state;
-					memcpy(WFIFOP(fd,40), auth_dat[i].error_message, 20);
-					memcpy(WFIFOP(fd,60), auth_dat[i].lastlogin, 24);
-					memcpy(WFIFOP(fd,84), auth_dat[i].last_ip, 16);
-					memcpy(WFIFOP(fd,100), auth_dat[i].email, 40);
-					WFIFOL(fd,140) = (unsigned long)auth_dat[i].expiration_time;
-					WFIFOL(fd,144) = (unsigned long)auth_dat[i].unban_time;
-					WFIFOW(fd,148) = (uint16)strlen(auth_dat[i].memo);
-					if (auth_dat[i].memo[0]) {
-						memcpy(WFIFOP(fd,150), auth_dat[i].memo, strlen(auth_dat[i].memo));
-					}
-					WFIFOSET(fd,150+strlen(auth_dat[i].memo));
-					break;
-				}
+			WFIFOL(fd,2) = account_id;
+
+			if( accounts->load_num(accounts, &acc, account_id) )
+			{
+				ShowNotice("'ladmin': Sending information of an account (request by the id; account: %s, id: %d, ip: %s)\n", acc.userid, account_id, ip);
+				WFIFOB(fd,6) = acc.level;
+				safestrncpy((char*)WFIFOP(fd,7), acc.userid, 24);
+				WFIFOB(fd,31) = acc.sex;
+				WFIFOL(fd,32) = acc.logincount;
+				WFIFOL(fd,36) = acc.state;
+				safestrncpy((char*)WFIFOP(fd,40), "-", 20); // error message (removed)
+				safestrncpy((char*)WFIFOP(fd,60), acc.lastlogin, 24);
+				safestrncpy((char*)WFIFOP(fd,84), acc.last_ip, 16);
+				safestrncpy((char*)WFIFOP(fd,100), acc.email, 40);
+				WFIFOL(fd,140) = (unsigned long)acc.expiration_time;
+				WFIFOL(fd,144) = (unsigned long)acc.unban_time;
+				WFIFOW(fd,148) = 0; // previously, this was strlen(memo), and memo went afterwards
 			}
-			if (i == auth_num) {
-				ShowNotice("'ladmin': Attempt to obtain information (by the id) of an unknown account (id: %d, ip: %s)\n", RFIFOL(fd,2), ip);
-				strncpy((char*)WFIFOP(fd,7), "", 24);
-				WFIFOW(fd,148) = 0;
-				WFIFOSET(fd,150);
+			else
+			{
+				ShowNotice("'ladmin': Attempt to obtain information (by the id) of an unknown account (id: %d, ip: %s)\n", account_id, ip);
+				safestrncpy((char*)WFIFOP(fd,7), "", 24); // not found
 			}
-			RFIFOSKIP(fd,6);
-			break;
 
-		case 0x7955:	// Request to reload GM file (no answer)
-			ShowStatus("'ladmin': Request to re-load GM configuration file (ip: %s).\n", ip);
-			read_gm_account();
-			// send GM accounts to all char-servers
-			send_GM_accounts(-1);
-			RFIFOSKIP(fd,2);
+			WFIFOSET(fd,150);
+		}
+			RFIFOSKIP(fd,6);
 			break;
 
 		default:
diff --git a/src/login/ipban.h b/src/login/ipban.h
new file mode 100644
index 000000000..b2a1a7d9e
--- /dev/null
+++ b/src/login/ipban.h
@@ -0,0 +1,25 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#ifndef __IPBAN_H_INCLUDED__
+#define __IPBAN_H_INCLUDED__
+
+#include "../common/cbasetypes.h"
+
+// initialize
+void ipban_init(void);
+
+// finalize
+void ipban_final(void);
+
+// check ip against ban list
+bool ipban_check(uint32 ip);
+
+// increases failure count for the specified IP
+void ipban_log(uint32 ip);
+
+// parses configuration option
+bool ipban_config_read(const char* key, const char* value);
+
+
+#endif // __IPBAN_H_INCLUDED__
diff --git a/src/login/ipban_sql.c b/src/login/ipban_sql.c
new file mode 100644
index 000000000..911ae23db
--- /dev/null
+++ b/src/login/ipban_sql.c
@@ -0,0 +1,209 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#include "../common/cbasetypes.h"
+#include "../common/db.h"
+#include "../common/malloc.h"
+#include "../common/sql.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "login.h"
+#include "ipban.h"
+#include <stdlib.h>
+#include <string.h>
+
+// database options
+static char   ipban_db_hostname[32] = "127.0.0.1";
+static uint16 ipban_db_port = 3306;
+static char   ipban_db_username[32] = "ragnarok";
+static char   ipban_db_password[32] = "ragnarok";
+static char   ipban_db_database[32] = "ragnarok";
+static char   ipban_table[32] = "ipbanlist";
+
+static char   log_db_hostname[32] = "127.0.0.1";
+static uint16 log_db_port = 3306;
+static char   log_db_username[32] = "ragnarok";
+static char   log_db_password[32] = "ragnarok";
+static char   log_db_database[32] = "ragnarok";
+static char   loginlog_table[32] = "loginlog";
+
+static char default_codepage[32] = "";
+
+// globals
+static Sql* sql_handle;
+static Sql* logsql_handle;
+static int cleanup_timer_id = INVALID_TIMER;
+
+int ipban_cleanup(int tid, unsigned int tick, int id, intptr data);
+
+
+// initialize
+void ipban_init(void)
+{
+	// establish connections
+	sql_handle = Sql_Malloc();
+	if( SQL_ERROR == Sql_Connect(sql_handle, ipban_db_username, ipban_db_password, ipban_db_hostname, ipban_db_port, ipban_db_database) )
+	{
+		Sql_ShowDebug(sql_handle);
+		Sql_Free(sql_handle);
+		exit(EXIT_FAILURE);
+	}
+	if( default_codepage[0] != '\0' && SQL_ERROR == Sql_SetEncoding(sql_handle, default_codepage) )
+		Sql_ShowDebug(sql_handle);
+
+	logsql_handle = Sql_Malloc();
+	if( SQL_ERROR == Sql_Connect(logsql_handle, log_db_username, log_db_password, log_db_hostname, log_db_port, log_db_database) )
+	{
+		Sql_ShowDebug(logsql_handle);
+		Sql_Free(logsql_handle);
+		exit(EXIT_FAILURE);
+	}
+	if( default_codepage[0] != '\0' && SQL_ERROR == Sql_SetEncoding(logsql_handle, default_codepage) )
+		Sql_ShowDebug(logsql_handle);
+
+	// set up periodic cleanup of connection history and active bans
+	add_timer_func_list(ipban_cleanup, "ipban_cleanup");
+	cleanup_timer_id = add_timer_interval(gettick()+10, ipban_cleanup, 0, 0, 60*1000);
+}
+
+// finalize
+void ipban_final(void)
+{
+	// release data
+	delete_timer(cleanup_timer_id, ipban_cleanup);
+
+	// close connections
+	Sql_Free(sql_handle);
+	sql_handle = NULL;
+	Sql_Free(logsql_handle);
+	logsql_handle = NULL;
+}
+
+// load configuration options
+bool ipban_config_read(const char* key, const char* value)
+{
+	// login server settings
+	if( strcmpi(key, "ipban.enable") == 0 )
+		login_config.ipban = (bool)config_switch(value);
+	else
+	if( strcmpi(key, "ipban.dynamic_pass_failure_ban") == 0 )
+		login_config.dynamic_pass_failure_ban = (bool)config_switch(value);
+	else
+	if( strcmpi(key, "ipban.dynamic_pass_failure_ban_interval") == 0 )
+		login_config.dynamic_pass_failure_ban_interval = atoi(value);
+	else
+	if( strcmpi(key, "ipban.dynamic_pass_failure_ban_limit") == 0 )
+		login_config.dynamic_pass_failure_ban_limit = atoi(value);
+	else
+	if( strcmpi(key, "ipban.dynamic_pass_failure_ban_duration") == 0 )
+		login_config.dynamic_pass_failure_ban_duration = atoi(value);
+	else
+
+	// ipban table settings
+	if( strcmpi(key, "ipban.sql.db_hostname") == 0 )
+		safestrncpy(ipban_db_hostname, value, sizeof(ipban_db_hostname));
+	else
+	if( strcmpi(key, "ipban.sql.db_port") == 0 )
+		ipban_db_port = (uint16)strtoul(value, NULL, 10);
+	else
+	if( strcmpi(key, "ipban.sql.db_username") == 0 )
+		safestrncpy(ipban_db_username, value, sizeof(ipban_db_username));
+	else
+	if( strcmpi(key, "ipban.sql.db_password") == 0 )
+		safestrncpy(ipban_db_password, value, sizeof(ipban_db_password));
+	else
+	if( strcmpi(key, "ipban.sql.db_database") == 0 )
+		safestrncpy(ipban_db_database, value, sizeof(ipban_db_database));
+	else
+	if( strcmpi(key, "ipban.sql.ipban_table") == 0 )
+		safestrncpy(ipban_table, value, sizeof(ipban_table));
+	else
+
+	// interserver settings
+	if( strcmpi(key, "log_db_ip") == 0 )
+		safestrncpy(log_db_hostname, value, sizeof(log_db_hostname));
+	else
+	if( strcmpi(key, "log_db_port") == 0 )
+		log_db_port = (uint16)strtoul(value, NULL, 10);
+	else
+	if( strcmpi(key, "log_db_id") == 0 )
+		safestrncpy(log_db_username, value, sizeof(log_db_username));
+	else
+	if( strcmpi(key, "log_db_pw") == 0 )
+		safestrncpy(log_db_password, value, sizeof(log_db_password));
+	else
+	if( strcmpi(key, "log_db") == 0 )
+		safestrncpy(log_db_database, value, sizeof(log_db_database));
+	else
+	if( strcmpi(key, "loginlog_db") == 0 )
+		safestrncpy(loginlog_table, value, sizeof(loginlog_table));
+	else
+	if( strcmpi(key, "default_codepage") == 0 )
+		safestrncpy(default_codepage, value, sizeof(default_codepage));
+	else
+		return false;
+
+	return true;
+}
+
+// check ip against active bans list
+bool ipban_check(uint32 ip)
+{
+	uint8* p = (uint8*)&ip;
+	char* data = NULL;
+	int matches;
+
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT count(*) FROM `%s` WHERE `list` = '%u.*.*.*' OR `list` = '%u.%u.*.*' OR `list` = '%u.%u.%u.*' OR `list` = '%u.%u.%u.%u'",
+		ipban_table, p[3], p[3], p[2], p[3], p[2], p[1], p[3], p[2], p[1], p[0]) )
+	{
+		Sql_ShowDebug(sql_handle);
+		// close connection because we can't verify their connectivity.
+		return true;
+	}
+
+	if( SQL_ERROR == Sql_NextRow(sql_handle) )
+		return true;// Shouldn't happen, but just in case...
+
+	Sql_GetData(sql_handle, 0, &data, NULL);
+	matches = atoi(data);
+	Sql_FreeResult(sql_handle);
+
+	return( matches > 0 );
+}
+
+// log failed attempt
+void ipban_log(uint32 ip)
+{
+	unsigned long failures = 0;
+	if( SQL_ERROR == Sql_Query(logsql_handle, "SELECT count(*) FROM `%s` WHERE `ip` = '%s' AND `rcode` = '1' AND `time` > NOW() - INTERVAL %d MINUTE",
+		loginlog_table, ip2str(ip,NULL), login_config.dynamic_pass_failure_ban_interval) )// how many times failed account? in one ip.
+		Sql_ShowDebug(sql_handle);
+
+	//check query result
+	if( SQL_SUCCESS == Sql_NextRow(logsql_handle) )
+	{
+		char* data;
+		Sql_GetData(logsql_handle, 0, &data, NULL);
+		failures = strtoul(data, NULL, 10);
+		Sql_FreeResult(logsql_handle);
+	}
+
+	// if over the limit, add a temporary ban entry
+	if( failures >= login_config.dynamic_pass_failure_ban_limit )
+	{
+		uint8* p = (uint8*)&ip;
+		if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s`(`list`,`btime`,`rtime`,`reason`) VALUES ('%u.%u.%u.*', NOW() , NOW() +  INTERVAL %d MINUTE ,'Password error ban')",
+			ipban_table, p[3], p[2], p[1], login_config.dynamic_pass_failure_ban_duration) )
+			Sql_ShowDebug(sql_handle);
+	}
+}
+
+// remove expired bans
+int ipban_cleanup(int tid, unsigned int tick, int id, intptr data)
+{
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `ipbanlist` WHERE `rtime` <= NOW()") )
+		Sql_ShowDebug(sql_handle);
+
+	return 0;
+}
diff --git a/src/login/ipban_txt.c b/src/login/ipban_txt.c
new file mode 100644
index 000000000..6fee15c28
--- /dev/null
+++ b/src/login/ipban_txt.c
@@ -0,0 +1,50 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#include "../common/cbasetypes.h"
+#include "../common/strlib.h"
+#include "login.h"
+#include "ipban.h"
+#include <stdlib.h>
+#include <string.h>
+
+void ipban_init(void)
+{
+}
+
+void ipban_final(void)
+{
+}
+
+bool ipban_check(uint32 ip)
+{
+	return false;
+}
+
+void ipban_log(uint32 ip)
+{
+}
+
+bool ipban_config_read(const char* key, const char* value)
+{
+	// login server settings
+	if( strcmpi(key, "ipban.enable") == 0 )
+		login_config.ipban = (bool)config_switch(value);
+	else
+	if( strcmpi(key, "ipban.dynamic_pass_failure_ban") == 0 )
+		login_config.dynamic_pass_failure_ban = (bool)config_switch(value);
+	else
+	if( strcmpi(key, "ipban.dynamic_pass_failure_ban_interval") == 0 )
+		login_config.dynamic_pass_failure_ban_interval = atoi(value);
+	else
+	if( strcmpi(key, "ipban.dynamic_pass_failure_ban_limit") == 0 )
+		login_config.dynamic_pass_failure_ban_limit = atoi(value);
+	else
+	if( strcmpi(key, "ipban.dynamic_pass_failure_ban_duration") == 0 )
+		login_config.dynamic_pass_failure_ban_duration = atoi(value);
+	else
+		return false;
+
+	return true;
+}
+
diff --git a/src/login/login.c b/src/login/login.c
index b26256570..2db051807 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -1,25 +1,25 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#include "../common/cbasetypes.h"
-#include "../common/mmo.h"
 #include "../common/core.h"
-#include "../common/socket.h"
 #include "../common/db.h"
-#include "../common/timer.h"
 #include "../common/malloc.h"
-#include "../common/strlib.h"
+#include "../common/md5calc.h"
 #include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
 #include "../common/version.h"
-#include "../common/md5calc.h"
-#include "../common/lock.h"
+#include "account.h"
+#include "ipban.h"
 #include "login.h"
+#include "loginlog.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/stat.h> // for stat/lstat/fstat
 
+bool ladmin_auth(struct login_session_data* sd, const char* ip);
 struct Login_Config login_config;
 
 int login_fd; // login server socket
@@ -29,6 +29,42 @@ struct mmo_char_server server[MAX_SERVERS]; // char server data
 #define sex_num2str(num) ( (num ==  0  ) ? 'F' : (num ==  1  ) ? 'M' : 'S' )
 #define sex_str2num(str) ( (str == 'F' ) ?  0  : (str == 'M' ) ?  1  :  2  )
 
+// Account engines available
+static struct{
+	AccountDB* (*constructor)(void);
+	AccountDB* db;
+} account_engines[] = {
+#ifdef WITH_TXT
+	{account_db_txt, NULL},
+#endif
+#ifdef WITH_SQL
+	{account_db_sql, NULL},
+#endif
+#ifdef ACCOUNTDB_ENGINE_0
+	{ACCOUNTDB_CONSTRUCTOR(ACCOUNTDB_ENGINE_0), NULL},
+#endif
+#ifdef ACCOUNTDB_ENGINE_1
+	{ACCOUNTDB_CONSTRUCTOR(ACCOUNTDB_ENGINE_1), NULL},
+#endif
+#ifdef ACCOUNTDB_ENGINE_2
+	{ACCOUNTDB_CONSTRUCTOR(ACCOUNTDB_ENGINE_2), NULL},
+#endif
+#ifdef ACCOUNTDB_ENGINE_3
+	{ACCOUNTDB_CONSTRUCTOR(ACCOUNTDB_ENGINE_3), NULL},
+#endif
+#ifdef ACCOUNTDB_ENGINE_4
+	{ACCOUNTDB_CONSTRUCTOR(ACCOUNTDB_ENGINE_4), NULL},
+#endif
+	// end of structure
+	{NULL, NULL}
+};
+// account database
+AccountDB* accounts = NULL;
+
+//Account registration flood protection [Kevin]
+int allowed_regs = 1;
+int time_allowed = 10; //in seconds
+
 // Advanced subnet check [LuzZza]
 struct s_subnet {
 	uint32 mask;
@@ -38,45 +74,6 @@ struct s_subnet {
 
 int subnet_count = 0;
 
-// GM account management
-struct gm_account* gm_account_db = NULL;
-unsigned int GM_num = 0; // number of gm accounts
-char GM_account_filename[1024] = "conf/GM_account.txt";
-long creation_time_GM_account_file; // tracks the last-changed timestamp of the gm accounts file
-int gm_account_filename_check_timer = 15; // Timer to check if GM_account file has been changed and reload GM account automaticaly (in seconds; default: 15)
-
-//Account registration flood protection [Kevin]
-int allowed_regs = 1;
-int time_allowed = 10; //in seconds
-unsigned int new_reg_tick = 0;
-
-
-// data handling (TXT)
-char account_filename[1024] = "save/account.txt";
-
-// account database
-struct mmo_account* auth_dat = NULL;
-unsigned int auth_num = 0, auth_max = 0;
-
-int account_id_count = START_ACCOUNT_NUM;
-
-// define the number of times that some players must authentify them before to save account file.
-// it's just about normal authentication. If an account is created or modified, save is immediatly done.
-// An authentication just change last connected IP and date. It already save in log file.
-// set minimum auth change before save:
-#define AUTH_BEFORE_SAVE_FILE 10
-// set divider of auth_num to found number of change before save
-#define AUTH_SAVE_FILE_DIVIDER 50
-int auth_before_save_file = 0; // Counter. First save when 1st char-server do connection.
-
-
-// ladmin configuration
-bool admin_state = false;
-char admin_pass[24] = "";
-uint32 admin_allowed_ip = 0;
-
-int parse_admin(int fd);
-
 
 //-----------------------------------------------------
 // Auth database
@@ -84,6 +81,7 @@ int parse_admin(int fd);
 #define AUTH_TIMEOUT 30000
 
 struct auth_node {
+
 	int account_id;
 	uint32 login_id1;
 	uint32 login_id2;
@@ -93,11 +91,12 @@ struct auth_node {
 
 static DBMap* auth_db; // int account_id -> struct auth_node*
 
+
 //-----------------------------------------------------
 // Online User Database [Wizputer]
 //-----------------------------------------------------
-
 struct online_login_data {
+
 	int account_id;
 	int waiting_disconnect;
 	int char_server;
@@ -157,582 +156,61 @@ static int waiting_disconnect_timer(int tid, unsigned int tick, int id, intptr d
 	return 0;
 }
 
-//--------------------------------------------------------------------
-// Packet send to all char-servers, except one (wos: without our self)
-//--------------------------------------------------------------------
-int charif_sendallwos(int sfd, uint8* buf, size_t len)
+static int online_db_setoffline(DBKey key, void* data, va_list ap)
 {
-	int i, c;
-
-	for( i = 0, c = 0; i < MAX_SERVERS; ++i )
+	struct online_login_data* p = (struct online_login_data*)data;
+	int server = va_arg(ap, int);
+	if( server == -1 )
 	{
-		int fd = server[i].fd;
-		if( session_isValid(fd) && fd != sfd )
+		p->char_server = -1;
+		if( p->waiting_disconnect != -1 )
 		{
-			WFIFOHEAD(fd,len);
-			memcpy(WFIFOP(fd,0), buf, len);
-			WFIFOSET(fd,len);
-			++c;
-		}
-	}
-
-	return c;
-}
-
-//----------------------------------------------------------------------
-// Determine if an account (id) is a GM account
-// and returns its level (or 0 if it isn't a GM account or if not found)
-//----------------------------------------------------------------------
-int isGM(int account_id)
-{
-	unsigned int i;
-	ARR_FIND( 0, GM_num, i, gm_account_db[i].account_id == account_id );
-	return ( i < GM_num ) ? gm_account_db[i].level : 0;
-}
-
-//----------------------------------------------------------------------
-// Adds a new GM using acc id and level
-//----------------------------------------------------------------------
-void addGM(int account_id, int level)
-{
-	static unsigned int GM_max = 0;
-	unsigned int i;
-
-	ARR_FIND( 0, auth_num, i, auth_dat[i].account_id == account_id );
-	if( i == auth_num )
-		return; // no such account
-
-	ARR_FIND( 0, GM_num, i, gm_account_db[i].account_id == account_id );
-	if( i < GM_num )
-	{
-		if (gm_account_db[i].level == level)
-			ShowWarning("addGM: GM account %d defined twice (same level: %d).\n", account_id, level);
-		else {
-			ShowWarning("addGM: GM account %d defined twice (levels: %d and %d).\n", account_id, gm_account_db[i].level, level);
-			gm_account_db[i].level = level;
-		}
-		return; // entry already present
-	}
-
-	// new account
-	if (GM_num >= GM_max) {
-		GM_max += 256;
-		RECREATE(gm_account_db, struct gm_account, GM_max);
-	}
-	gm_account_db[GM_num].account_id = account_id;
-	gm_account_db[GM_num].level = level;
-	GM_num++;
-	if (GM_num >= 4000)
-		ShowWarning("4000 GM accounts found. Next GM accounts are not read.\n");
-}
-
-//-------------------------------------------------------
-// Reading function of GM accounts file (and their level)
-//-------------------------------------------------------
-int read_gm_account(void)
-{
-	char line[512];
-	FILE *fp;
-	int account_id, level;
-	int line_counter;
-	struct stat file_stat;
-	int start_range = 0, end_range = 0, is_range = 0, current_id = 0;
-
-	if(gm_account_db) aFree(gm_account_db);
-	CREATE(gm_account_db, struct gm_account, 1);
-	GM_num = 0;
-
-	// get last modify time/date
-	if (stat(GM_account_filename, &file_stat))
-		creation_time_GM_account_file = 0; // error
-	else
-		creation_time_GM_account_file = (long)file_stat.st_mtime;
-
-	if ((fp = fopen(GM_account_filename, "r")) == NULL) {
-		ShowError("read_gm_account: GM accounts file [%s] not found.\n", GM_account_filename);
-		return 1;
-	}
-
-	line_counter = 0;
-	// limited to 4000, because we send information to char-servers (more than 4000 GM accounts???)
-	// int (id) + int (level) = 8 bytes * 4000 = 32k (limit of packets in windows)
-	while(fgets(line, sizeof(line), fp) && GM_num < 4000)
-	{
-		line_counter++;
-		if ((line[0] == '/' && line[1] == '/') || line[0] == '\0' || line[0] == '\n' || line[0] == '\r')
-			continue;
-		is_range = (sscanf(line, "%d%*[-~]%d %d",&start_range,&end_range,&level)==3); // ID Range [MC Cameri]
-		if (!is_range && sscanf(line, "%d %d", &account_id, &level) != 2 && sscanf(line, "%d: %d", &account_id, &level) != 2)
-			ShowError("read_gm_account: file [%s], invalid 'acount_id|range level' format (line #%d).\n", GM_account_filename, line_counter);
-		else if (level <= 0)
-			ShowError("read_gm_account: file [%s] %dth account (line #%d) (invalid level [0 or negative]: %d).\n", GM_account_filename, GM_num+1, line_counter, level);
-		else {
-			if (level > 99) {
-				ShowNotice("read_gm_account: file [%s] %dth account (invalid level, but corrected: %d->99).\n", GM_account_filename, GM_num+1, level);
-				level = 99;
-			}
-			if (is_range) {
-				if (start_range==end_range)
-					ShowError("read_gm_account: file [%s] invalid range, beginning of range is equal to end of range (line #%d).\n", GM_account_filename, line_counter);
-				else if (start_range>end_range)
-					ShowError("read_gm_account: file [%s] invalid range, beginning of range must be lower than end of range (line #%d).\n", GM_account_filename, line_counter);
-				else
-					for (current_id = start_range;current_id<=end_range;current_id++)
-						addGM(current_id,level);
-			} else {
-				addGM(account_id,level);
-			}
+			delete_timer(p->waiting_disconnect, waiting_disconnect_timer);
+			p->waiting_disconnect = -1;
 		}
 	}
-	fclose(fp);
-
-	ShowStatus("read_gm_account: file '%s' read (%d GM accounts found).\n", GM_account_filename, GM_num);
-
+	else if( p->char_server == server )
+		p->char_server = -2; //Char server disconnected.
 	return 0;
 }
 
-
-//-----------------------------------------------
-// Search an account id
-//   (return account index or -1 (if not found))
-//   If exact account name is not found,
-//   the function checks without case sensitive
-//   and returns index if only 1 account is found
-//   and similar to the searched name.
-//-----------------------------------------------
-int search_account_index(char* account_name)
+static int online_data_cleanup_sub(DBKey key, void *data, va_list ap)
 {
-	unsigned int i, quantity;
-	int index;
-
-	quantity = 0;
-	index = -1;
-
-	for(i = 0; i < auth_num; i++) {
-		// Without case sensitive check (increase the number of similar account names found)
-		if (stricmp(auth_dat[i].userid, account_name) == 0) {
-			// Strict comparison (if found, we finish the function immediatly with correct value)
-			if (strcmp(auth_dat[i].userid, account_name) == 0)
-				return i;
-			quantity++;
-			index = i;
-		}
-	}
-	// Here, the exact account name is not found
-	// We return the found index of a similar account ONLY if there is 1 similar account
-	if (quantity == 1)
-		return index;
-
-	// Exact account name is not found and 0 or more than 1 similar accounts have been found ==> we say not found
-	return -1;
+	struct online_login_data *character= (struct online_login_data*)data;
+	if (character->char_server == -2) //Unknown server.. set them offline
+		remove_online_user(character->account_id);
+	return 0;
 }
 
-//--------------------------------------------------------
-// Create a string to save the account in the account file
-//--------------------------------------------------------
-int mmo_auth_tostr(char* str, struct mmo_account* p)
+static int online_data_cleanup(int tid, unsigned int tick, int id, intptr data)
 {
-	int i;
-	char *str_p = str;
-
-	str_p += sprintf(str_p, "%d\t%s\t%s\t%s\t%c\t%d\t%u\t%s\t%s\t%ld\t%s\t%s\t%ld\t",
-	                 p->account_id, p->userid, p->pass, p->lastlogin, p->sex,
-	                 p->logincount, p->state, p->email, p->error_message,
-	                 (long)p->expiration_time, p->last_ip, p->memo, (long)p->unban_time);
-
-	for(i = 0; i < p->account_reg2_num; i++)
-		if (p->account_reg2[i].str[0])
-			str_p += sprintf(str_p, "%s,%s ", p->account_reg2[i].str, p->account_reg2[i].value);
-
+	online_db->foreach(online_db, online_data_cleanup_sub);
 	return 0;
-}
+} 
 
-//---------------------------------
-// Reading of the accounts database
-//---------------------------------
-int mmo_auth_init(void)
+
+//--------------------------------------------------------------------
+// Packet send to all char-servers, except one (wos: without our self)
+//--------------------------------------------------------------------
+int charif_sendallwos(int sfd, uint8* buf, size_t len)
 {
-	FILE *fp;
-	int account_id;
-	uint32 state;
-	int logincount, n;
-	uint32 i, j;
-	char line[2048], *p, userid[2048], pass[2048], lastlogin[2048], sex, email[2048], error_message[2048], last_ip[2048], memo[2048];
-	long unban_time;
-	long expiration_time;
-	char str[2048];
-	char v[2048];
-	int GM_count = 0;
-	int server_count = 0;
-
-	auth_max = 256;
-	CREATE(auth_dat, struct mmo_account, auth_max);
-
-	if ((fp = fopen(account_filename, "r")) == NULL) {
-		// no account file -> no account -> no login, including char-server (ERROR)
-		ShowError(CL_RED"mmmo_auth_init: Accounts file [%s] not found."CL_RESET"\n", account_filename);
-		return 0;
-	}
+	int i, c;
 
-	while(fgets(line, sizeof(line), fp) != NULL)
+	for( i = 0, c = 0; i < MAX_SERVERS; ++i )
 	{
-		if (line[0] == '/' && line[1] == '/')
-			continue;
-
-		p = line;
-
-		memset(userid, 0, sizeof(userid));
-		memset(pass, 0, sizeof(pass));
-		memset(lastlogin, 0, sizeof(lastlogin));
-		memset(email, 0, sizeof(email));
-		memset(error_message, 0, sizeof(error_message));
-		memset(last_ip, 0, sizeof(last_ip));
-		memset(memo, 0, sizeof(memo));
-
-		// database version reading (v2)
-		if (((i = sscanf(line, "%d\t%[^\t]\t%[^\t]\t%[^\t]\t%c\t%d\t%u\t"
-		                 "%[^\t]\t%[^\t]\t%ld\t%[^\t]\t%[^\t]\t%ld%n",
-		    &account_id, userid, pass, lastlogin, &sex, &logincount, &state,
-		    email, error_message, &expiration_time, last_ip, memo, &unban_time, &n)) == 13 && line[n] == '\t') ||
-		    ((i = sscanf(line, "%d\t%[^\t]\t%[^\t]\t%[^\t]\t%c\t%d\t%u\t"
-		                 "%[^\t]\t%[^\t]\t%ld\t%[^\t]\t%[^\t]%n",
-		    &account_id, userid, pass, lastlogin, &sex, &logincount, &state,
-		    email, error_message, &expiration_time, last_ip, memo, &n)) == 12 && line[n] == '\t')) {
-			n = n + 1;
-
-			// Some checks
-			if (account_id > END_ACCOUNT_NUM) {
-				ShowError(CL_RED"mmmo_auth_init: an account has an id higher than %d\n", END_ACCOUNT_NUM);
-				ShowError("               account id #%d -> account not read (data is lost!)."CL_RESET"\n", account_id);
-				continue;
-			}
-			userid[23] = '\0';
-			remove_control_chars(userid);
-			for(j = 0; j < auth_num; j++) {
-				if (auth_dat[j].account_id == account_id) {
-					ShowError(CL_RED"mmmo_auth_init: an account has an identical id to another.\n");
-					ShowError("               account id #%d -> new account not read (data is lost!)."CL_RED"\n", account_id);
-					break;
-				} else if (strcmp(auth_dat[j].userid, userid) == 0) {
-					ShowError(CL_RED"mmmo_auth_init: account name already exists.\n");
-					ShowError("               account name '%s' -> new account not read (data is lost!)."CL_RESET"\n", userid); // 2 lines, account name can be long.
-					break;
-				}
-			}
-			if (j != auth_num)
-				continue;
-
-			if (auth_num >= auth_max) {
-				auth_max += 256;
-				auth_dat = (struct mmo_account*)aRealloc(auth_dat, sizeof(struct mmo_account) * auth_max);
-			}
-
-			memset(&auth_dat[auth_num], '\0', sizeof(struct mmo_account));
-
-			auth_dat[auth_num].account_id = account_id;
-
-			strncpy(auth_dat[auth_num].userid, userid, 24);
-
-			pass[32] = '\0';
-			remove_control_chars(pass);
-			strncpy(auth_dat[auth_num].pass, pass, 32);
-
-			lastlogin[23] = '\0';
-			remove_control_chars(lastlogin);
-			strncpy(auth_dat[auth_num].lastlogin, lastlogin, 24);
-
-			auth_dat[auth_num].sex = sex;
-
-			if (logincount >= 0)
-				auth_dat[auth_num].logincount = logincount;
-			else
-				auth_dat[auth_num].logincount = 0;
-
-			if (state > 255)
-				auth_dat[auth_num].state = 100;
-			else
-				auth_dat[auth_num].state = state;
-
-			if (e_mail_check(email) == 0) {
-				ShowNotice("Account %s (%d): invalid e-mail (replaced par a@a.com).\n", auth_dat[auth_num].userid, auth_dat[auth_num].account_id);
-				strncpy(auth_dat[auth_num].email, "a@a.com", 40);
-			} else {
-				remove_control_chars(email);
-				strncpy(auth_dat[auth_num].email, email, 40);
-			}
-
-			error_message[19] = '\0';
-			remove_control_chars(error_message);
-			if (error_message[0] == '\0' || state != 7) { // 7, because state is packet 0x006a value + 1
-				strncpy(auth_dat[auth_num].error_message, "-", 20);
-			} else {
-				strncpy(auth_dat[auth_num].error_message, error_message, 20);
-			}
-
-			if (i == 13)
-				auth_dat[auth_num].unban_time = (time_t)unban_time;
-			else
-				auth_dat[auth_num].unban_time = 0;
-
-			auth_dat[auth_num].expiration_time = (time_t)expiration_time;
-
-			last_ip[15] = '\0';
-			remove_control_chars(last_ip);
-			strncpy(auth_dat[auth_num].last_ip, last_ip, 16);
-
-			memo[254] = '\0';
-			remove_control_chars(memo);
-			strncpy(auth_dat[auth_num].memo, memo, 255);
-
-			for(j = 0; j < ACCOUNT_REG2_NUM; j++) {
-				p += n;
-				if (sscanf(p, "%[^\t,],%[^\t ] %n", str, v, &n) != 2) { 
-					// We must check if a str is void. If it's, we can continue to read other REG2.
-					// Account line will have something like: str2,9 ,9 str3,1 (here, ,9 is not good)
-					if (p[0] == ',' && sscanf(p, ",%[^\t ] %n", v, &n) == 1) { 
-						j--;
-						continue;
-					} else
-						break;
-				}
-				str[31] = '\0';
-				remove_control_chars(str);
-				strncpy(auth_dat[auth_num].account_reg2[j].str, str, 32);
-				strncpy(auth_dat[auth_num].account_reg2[j].value,v,256);
-			}
-			auth_dat[auth_num].account_reg2_num = j;
-
-			if (isGM(account_id) > 0)
-				GM_count++;
-			if (auth_dat[auth_num].sex == 'S')
-				server_count++;
-
-			auth_num++;
-			if (account_id >= account_id_count)
-				account_id_count = account_id + 1;
-
-		// Old athena database version reading (v1)
-		} else if ((i = sscanf(line, "%d\t%[^\t]\t%[^\t]\t%[^\t]\t%c\t%d\t%u\t%n",
-		           &account_id, userid, pass, lastlogin, &sex, &logincount, &state, &n)) >= 5) {
-			if (account_id > END_ACCOUNT_NUM) {
-				ShowError(CL_RED"mmmo_auth_init: an account has an id higher than %d\n", END_ACCOUNT_NUM);
-				ShowError("               account id #%d -> account not read (data is lost!)."CL_RESET"\n", account_id);
-				continue;
-			}
-			userid[23] = '\0';
-			remove_control_chars(userid);
-			for(j = 0; j < auth_num; j++) {
-				if (auth_dat[j].account_id == account_id) {
-					ShowError(CL_RED"mmo_auth_init: an account has an identical id to another.\n");
-					ShowError("               account id #%d -> new account not read (data is lost!)."CL_RESET"\n", account_id);
-					break;
-				} else if (strcmp(auth_dat[j].userid, userid) == 0) {
-					ShowError(CL_RED"mmo_auth_init: account name already exists.\n");
-					ShowError("               account name '%s' -> new account not read (data is lost!)."CL_RESET"\n", userid);
-					break;
-				}
-			}
-			if (j != auth_num)
-				continue;
-
-			if (auth_num >= auth_max) {
-				auth_max += 256;
-				RECREATE(auth_dat, struct mmo_account, auth_max);
-			}
-
-			memset(&auth_dat[auth_num], '\0', sizeof(struct mmo_account));
-
-			auth_dat[auth_num].account_id = account_id;
-
-			strncpy(auth_dat[auth_num].userid, userid, 24);
-
-			pass[23] = '\0';
-			remove_control_chars(pass);
-			strncpy(auth_dat[auth_num].pass, pass, 24);
-
-			lastlogin[23] = '\0';
-			remove_control_chars(lastlogin);
-			strncpy(auth_dat[auth_num].lastlogin, lastlogin, 24);
-
-			auth_dat[auth_num].sex = sex;
-
-			if (i >= 6) {
-				if (logincount >= 0)
-					auth_dat[auth_num].logincount = logincount;
-				else
-					auth_dat[auth_num].logincount = 0;
-			} else
-				auth_dat[auth_num].logincount = 0;
-
-			if (i >= 7) {
-				if (state > 255)
-					auth_dat[auth_num].state = 100;
-				else
-					auth_dat[auth_num].state = state;
-			} else
-				auth_dat[auth_num].state = 0;
-
-			// Initialization of new data
-			strncpy(auth_dat[auth_num].email, "a@a.com", 40);
-			strncpy(auth_dat[auth_num].error_message, "-", 20);
-			auth_dat[auth_num].unban_time = 0;
-			auth_dat[auth_num].expiration_time = 0;
-			strncpy(auth_dat[auth_num].last_ip, "-", 16);
-			strncpy(auth_dat[auth_num].memo, "-", 255);
-
-			for(j = 0; j < ACCOUNT_REG2_NUM; j++) {
-				p += n;
-				if (sscanf(p, "%[^\t,],%[^\t ] %n", str, v, &n) != 2) { 
-					// We must check if a str is void. If it's, we can continue to read other REG2.
-					// Account line will have something like: str2,9 ,9 str3,1 (here, ,9 is not good)
-					if (p[0] == ',' && sscanf(p, ",%[^\t ] %n", v, &n) == 1) { 
-						j--;
-						continue;
-					} else
-						break;
-				}
-				str[31] = '\0';
-				remove_control_chars(str);
-				strncpy(auth_dat[auth_num].account_reg2[j].str, str, 32);
-				strncpy(auth_dat[auth_num].account_reg2[j].value,v,256);
-			}
-			auth_dat[auth_num].account_reg2_num = j;
-
-			if (isGM(account_id) > 0)
-				GM_count++;
-			if (auth_dat[auth_num].sex == 'S')
-				server_count++;
-
-			auth_num++;
-			if (account_id >= account_id_count)
-				account_id_count = account_id + 1;
-
-		} else {
-			int i = 0;
-			if (sscanf(line, "%d\t%%newid%%\n%n", &account_id, &i) == 1 &&
-			    i > 0 && account_id > account_id_count)
-				account_id_count = account_id;
-		}
-	}
-	fclose(fp);
-
-	if( auth_num == 0 )
-		ShowNotice("mmo_auth_init: No account found in %s.\n", account_filename);
-	else
-	if( auth_num == 1 )
-		ShowStatus("mmo_auth_init: 1 account read in %s,\n", account_filename);
-	else
-		ShowStatus("mmo_auth_init: %d accounts read in %s,\n", auth_num, account_filename);
-
-	if( GM_count == 0 )
-		ShowStatus("               of which is no GM account, and \n");
-	else
-	if( GM_count == 1 )
-		ShowStatus("               of which is 1 GM account, and \n");
-	else
-		ShowStatus("               of which is %d GM accounts, and \n", GM_count);
-
-	if( server_count == 0 )
-		ShowStatus("               no server account ('S').\n");
-	else
-	if( server_count == 1 )
-		ShowStatus("               1 server account ('S').\n");
-	else
-		ShowStatus("               %d server accounts ('S').\n", server_count);
-
-	return 0;
-}
-
-//------------------------------------------
-// Writing of the accounts database file
-//   (accounts are sorted by id before save)
-//------------------------------------------
-void mmo_auth_sync(void)
-{
-	FILE *fp;
-	unsigned int i, j, k;
-	int lock;
-	int account_id;
-	CREATE_BUFFER(id, int, auth_num);
-	char line[65536];
-
-	// Sorting before save
-	for(i = 0; i < auth_num; i++) {
-		id[i] = i;
-		account_id = auth_dat[i].account_id;
-		for(j = 0; j < i; j++) {
-			if (account_id < auth_dat[id[j]].account_id) {
-				for(k = i; k > j; k--)
-					id[k] = id[k-1];
-				id[j] = i; // id[i]
-				break;
-			}
+		int fd = server[i].fd;
+		if( session_isValid(fd) && fd != sfd )
+		{
+			WFIFOHEAD(fd,len);
+			memcpy(WFIFOP(fd,0), buf, len);
+			WFIFOSET(fd,len);
+			++c;
 		}
 	}
 
-	// Data save
-	if ((fp = lock_fopen(account_filename, &lock)) == NULL) {
-		//if (id) aFree(id);
-		DELETE_BUFFER(id);
-		return;
-	}
-
-	fprintf(fp, "// Accounts file: here are saved all information about the accounts.\n");
-	fprintf(fp, "// Structure: ID, account name, password, last login time, sex, # of logins, state, email, error message for state 7, validity time, last (accepted) login ip, memo field, ban timestamp, repeated(register text, register value)\n");
-	fprintf(fp, "// Some explanations:\n");
-	fprintf(fp, "//   account name    : between 4 to 23 char for a normal account (standard client can't send less than 4 char).\n");
-	fprintf(fp, "//   account password: between 4 to 23 char\n");
-	fprintf(fp, "//   sex             : M or F for normal accounts, S for server accounts\n");
-	fprintf(fp, "//   state           : 0: account is ok, 1 to 256: error code of packet 0x006a + 1\n");
-	fprintf(fp, "//   email           : between 3 to 39 char (a@a.com is like no email)\n");
-	fprintf(fp, "//   error message   : text for the state 7: 'Your are Prohibited to login until <text>'. Max 19 char\n");
-	fprintf(fp, "//   valitidy time   : 0: unlimited account, <other value>: date calculated by addition of 1/1/1970 + value (number of seconds since the 1/1/1970)\n");
-	fprintf(fp, "//   memo field      : max 254 char\n");
-	fprintf(fp, "//   ban time        : 0: no ban, <other value>: banned until the date: date calculated by addition of 1/1/1970 + value (number of seconds since the 1/1/1970)\n");
-	for(i = 0; i < auth_num; i++) {
-		k = id[i]; // use of sorted index
-		if (auth_dat[k].account_id == -1)
-			continue;
-
-		mmo_auth_tostr(line, &auth_dat[k]);
-		fprintf(fp, "%s\n", line);
-	}
-	fprintf(fp, "%d\t%%newid%%\n", account_id_count);
-
-	lock_fclose(fp, account_filename, &lock);
-
-	// set new counter to minimum number of auth before save
-	auth_before_save_file = auth_num / AUTH_SAVE_FILE_DIVIDER; // Re-initialise counter. We have save.
-	if (auth_before_save_file < AUTH_BEFORE_SAVE_FILE)
-		auth_before_save_file = AUTH_BEFORE_SAVE_FILE;
-
-	//if (id) aFree(id);
-	DELETE_BUFFER(id);
-
-	return;
+	return c;
 }
 
-//-----------------------------------------------------
-// Check if we must save accounts file or not
-//   every minute, we check if we must save because we
-//   have do some authentications without arrive to
-//   the minimum of authentications for the save.
-// Note: all other modification of accounts (deletion,
-//       change of some informations excepted lastip/
-//       lastlogintime, creation) are always save
-//       immediatly and set  the minimum of
-//       authentications to its initialization value.
-//-----------------------------------------------------
-int check_auth_sync(int tid, unsigned int tick, int id, intptr data)
-{
-	// we only save if necessary:
-	// we have do some authentications without do saving
-	if (auth_before_save_file < AUTH_BEFORE_SAVE_FILE ||
-	    auth_before_save_file < (int)(auth_num / AUTH_SAVE_FILE_DIVIDER))
-		mmo_auth_sync();
-
-	return 0;
-}
 
 //-----------------------------------------------------
 // periodic ip address synchronization
@@ -746,345 +224,148 @@ static int sync_ip_addresses(int tid, unsigned int tick, int id, intptr data)
 	return 0;
 }
 
-//-----------------------------------------------------
-// Send GM accounts to one or all char-servers
-//-----------------------------------------------------
-void send_GM_accounts(int fd)
-{
-	unsigned int i;
-	uint8 buf[32767];
-	uint16 len;
-
-	len = 4;
-	WBUFW(buf,0) = 0x2732;
-	for(i = 0; i < GM_num; i++)
-		// send only existing accounts. We can not create a GM account when server is online.
-		if (gm_account_db[i].level > 0) {
-			WBUFL(buf,len) = gm_account_db[i].account_id;
-			WBUFB(buf,len+4) = (uint8)gm_account_db[i].level;
-			len += 5;
-			if (len >= 32000) {
-				ShowWarning("send_GM_accounts: Too many accounts! Only %d out of %d were sent.\n", i, GM_num);
-				break;
-			}
-		}
-
-	WBUFW(buf,2) = len;
-	if (fd == -1) // send to all charservers
-		charif_sendallwos(-1, buf, len);
-	else { // send only to target
-		WFIFOHEAD(fd,len);
-		memcpy(WFIFOP(fd,0), buf, len);
-		WFIFOSET(fd,len);
-	}
-
-	return;
-}
 
 //-----------------------------------------------------
-// Check if GM file account have been changed
-//-----------------------------------------------------
-int check_GM_file(int tid, unsigned int tick, int id, intptr data)
-{
-	struct stat file_stat;
-	long new_time;
-
-	// if we would not check
-	if (gm_account_filename_check_timer < 1)
-		return 0;
-
-	// get last modify time/date
-	if (stat(GM_account_filename, &file_stat))
-		new_time = 0; // error
-	else
-		new_time = (long)file_stat.st_mtime;
-
-	if (new_time != creation_time_GM_account_file) {
-		read_gm_account();
-		send_GM_accounts(-1);
-	}
-
-	return 0;
-}
-
-
-//-----------------------------------------------------
-// encrypted/unencrypted password check
+// encrypted/unencrypted password check (from eApp)
 //-----------------------------------------------------
 bool check_encrypted(const char* str1, const char* str2, const char* passwd)
 {
 	char md5str[64], md5bin[32];
 
-	snprintf(md5str, sizeof(md5str), "%s%s", str1, str2);
-	md5str[sizeof(md5str)-1] = '\0';
+	safesnprintf(md5str, sizeof(md5str), "%s%s", str1, str2);
 	MD5_String2binary(md5str, md5bin);
 
 	return (0==memcmp(passwd, md5bin, 16));
 }
 
-bool check_password(struct login_session_data* sd, int passwdenc, const char* passwd, const char* refpass)
+bool check_password(const char* md5key, int passwdenc, const char* passwd, const char* refpass)
 {	
 	if(passwdenc == 0)
 	{
 		return (0==strcmp(passwd, refpass));
 	}
-	else if(sd != NULL)
+	else
 	{
-		// password mode set to 1 -> (md5key, refpass) enable with <passwordencrypt></passwordencrypt>
-		// password mode set to 2 -> (refpass, md5key) enable with <passwordencrypt2></passwordencrypt2>
+		// password mode set to 1 -> md5(md5key, refpass) enable with <passwordencrypt></passwordencrypt>
+		// password mode set to 2 -> md5(refpass, md5key) enable with <passwordencrypt2></passwordencrypt2>
 		
-		return ((passwdenc&0x01) && check_encrypted(sd->md5key, refpass, passwd)) ||
-		       ((passwdenc&0x02) && check_encrypted(refpass, sd->md5key, passwd));
+		return ((passwdenc&0x01) && check_encrypted(md5key, refpass, passwd)) ||
+		       ((passwdenc&0x02) && check_encrypted(refpass, md5key, passwd));
 	}
-	return false;
 }
 
 
-//-------------------------------------
-// Make new account
-//-------------------------------------
-int mmo_auth_new(struct mmo_account* account)
+//-----------------------------------------------------
+// custom timestamp formatting (from eApp)
+//-----------------------------------------------------
+const char* timestamp2string(char* str, size_t size, time_t timestamp, const char* format)
 {
-	static int num_regs = 0; // registration counter
-	unsigned int tick = gettick();
-
-	time_t expiration_time = 0;
-	unsigned int i = auth_num;
-
-	// check if the account doesn't exist already
-	ARR_FIND( 0, auth_num, i, strcmp(account->userid, auth_dat[i].userid) == 0 );
-	if( i < auth_num )
-	{
-		ShowNotice("Attempt of creation of an already existant account (account: %s_%c, pass: %s, received pass: %s)\n", account->userid, account->sex, auth_dat[i].pass, account->pass);
-		return 1; // 1 = Incorrect Password
-	}
-
-	//Account Registration Flood Protection by [Kevin]
-	if( DIFF_TICK(tick, new_reg_tick) < 0 && num_regs >= allowed_regs )
-	{
-		ShowNotice("Account registration denied (registration limit exceeded)\n");
-		return 3;
-	}
-
-	if (auth_num >= auth_max) {
-		auth_max += 256;
-		auth_dat = (struct mmo_account*)aRealloc(auth_dat, sizeof(struct mmo_account) * auth_max);
-	}
-
-	memset(&auth_dat[i], '\0', sizeof(struct mmo_account));
-
-	// find a suitable non-gm account id
-	while (isGM(account_id_count) > 0)
-		account_id_count++;
+	size_t len = strftime(str, size, format, localtime(&timestamp));
+	memset(str + len, '\0', size - len);
+	return str;
+}
 
-	auth_dat[i].account_id = account_id_count++;
-	safestrncpy(auth_dat[i].userid, account->userid, NAME_LENGTH);
-	if( login_config.use_md5_passwds )
-		MD5_String(account->pass, auth_dat[i].pass);
-	else
-		safestrncpy(auth_dat[i].pass, account->pass, NAME_LENGTH);
-	safestrncpy(auth_dat[i].lastlogin, "-", sizeof(auth_dat[i].lastlogin));
-	auth_dat[i].sex = account->sex;
-	auth_dat[i].logincount = 0;
-	auth_dat[i].state = 0;
-	safestrncpy(auth_dat[i].email, e_mail_check(account->email) ? account->email : "a@a.com", sizeof(auth_dat[i].email));
-	safestrncpy(auth_dat[i].error_message, "-", sizeof(auth_dat[i].error_message));
-	auth_dat[i].unban_time = 0;
-	if( login_config.start_limited_time != -1 )
-		expiration_time = time(NULL) + login_config.start_limited_time;
-	auth_dat[i].expiration_time = expiration_time;
-	strncpy(auth_dat[i].last_ip, "-", 16);
-	strncpy(auth_dat[i].memo, "-", 255);
-	auth_dat[i].account_reg2_num = 0;
-
-	ShowNotice("Account creation (account %s, id: %d, pass: %s, sex: %c)\n", account->userid, auth_num, account->pass, account->sex);
-	auth_num++;
 
-	if( DIFF_TICK(tick, new_reg_tick) > 0 )
-	{// Update the registration check.
-		num_regs = 0;
-		new_reg_tick = tick + time_allowed*1000;
-	}
-	++num_regs;
-
-	return 0;
+//--------------------------------------------
+// Test to know if an IP come from LAN or WAN.
+//--------------------------------------------
+int lan_subnetcheck(uint32 ip)
+{
+	int i;
+	ARR_FIND( 0, subnet_count, i, (subnet[i].char_ip & subnet[i].mask) == (ip & subnet[i].mask) );
+	return ( i < subnet_count ) ? subnet[i].char_ip : 0;
 }
 
-//-----------------------------------------------------
-// Check/authentication of a connection
-//-----------------------------------------------------
-int mmo_auth(struct login_session_data* sd)
+//----------------------------------
+// Reading Lan Support configuration
+//----------------------------------
+int login_lan_config_read(const char *lancfgName)
 {
-	unsigned int i;
-	time_t raw_time;
-	char tmpstr[256];
-	size_t len;
-	char user_password[32+1]; // reserve for md5-ed pw
-
-	char ip[16];
-	ip2str(session[sd->fd]->client_addr, ip);
+	FILE *fp;
+	int line_num = 0;
+	char line[1024], w1[64], w2[64], w3[64], w4[64];
 
-	// DNS Blacklist check
-	if( login_config.use_dnsbl )
-	{
-		char r_ip[16];
-		char ip_dnsbl[256];
-		char* dnsbl_serv;
-		bool matched = false;
-		uint8* sin_addr = (uint8*)&session[sd->fd]->client_addr;
+	if((fp = fopen(lancfgName, "r")) == NULL) {
+		ShowWarning("LAN Support configuration file is not found: %s\n", lancfgName);
+		return 1;
+	}
 
-		sprintf(r_ip, "%u.%u.%u.%u", sin_addr[0], sin_addr[1], sin_addr[2], sin_addr[3]);
+	ShowInfo("Reading the configuration file %s...\n", lancfgName);
 
-		for( dnsbl_serv = strtok(login_config.dnsbl_servs,","); !matched && dnsbl_serv != NULL; dnsbl_serv = strtok(NULL,",") )
-		{
-			sprintf(ip_dnsbl, "%s.%s", r_ip, dnsbl_serv);
-			if( host2ip(ip_dnsbl) )
-				matched = true;
-		}
+	while(fgets(line, sizeof(line), fp))
+	{
+		line_num++;
+		if ((line[0] == '/' && line[1] == '/') || line[0] == '\n' || line[1] == '\n')
+			continue;
 
-		if( matched )
+		if(sscanf(line,"%[^:]: %[^:]:%[^:]:%[^\r\n]", w1, w2, w3, w4) != 4)
 		{
-			ShowInfo("DNSBL: (%s) Blacklisted. User Kicked.\n", r_ip);
-			return 3;
+			ShowWarning("Error syntax of configuration file %s in line %d.\n", lancfgName, line_num);
+			continue;
 		}
-	}
-
-	//Client Version check
-	if( login_config.check_client_version && sd->version != login_config.client_version_to_connect )
-		return 5;
 
-	len = strnlen(sd->userid, NAME_LENGTH);
-
-	// Account creation with _M/_F
-	if( login_config.new_account_flag )
-	{
-		if( len > 2 && strnlen(sd->passwd, NAME_LENGTH) > 0 && // valid user and password lengths
-			sd->passwdenc == 0 && // unencoded password
-			sd->userid[len-2] == '_' && memchr("FfMm", sd->userid[len-1], 4) && // _M/_F suffix
-			account_id_count <= END_ACCOUNT_NUM )
+		if( strcmpi(w1, "subnet") == 0 )
 		{
-			struct mmo_account acc;
-			int result;
-
-			len -= 2;
-			sd->userid[len] = '\0';
-
-			memset(&acc, '\0', sizeof(acc));
-			safestrncpy(acc.userid, sd->userid, NAME_LENGTH);
-			safestrncpy(acc.pass, sd->passwd, NAME_LENGTH);
-			safestrncpy(acc.email, "a@a.com", sizeof(acc.email));
-			acc.sex = TOUPPER(sd->userid[len+1]);
+			subnet[subnet_count].mask = str2ip(w2);
+			subnet[subnet_count].char_ip = str2ip(w3);
+			subnet[subnet_count].map_ip = str2ip(w4);
 
-			result = mmo_auth_new(&acc);
-			if( result )
-				return result;// Failed to make account. [Skotlex].
+			if( (subnet[subnet_count].char_ip & subnet[subnet_count].mask) != (subnet[subnet_count].map_ip & subnet[subnet_count].mask) )
+			{
+				ShowError("%s: Configuration Error: The char server (%s) and map server (%s) belong to different subnetworks!\n", lancfgName, w3, w4);
+				continue;
+			}
 
-			auth_before_save_file = 0; // Creation of an account -> save accounts file immediatly
+			subnet_count++;
 		}
 	}
-	
-	// Strict account search
-	ARR_FIND( 0, auth_num, i, strcmp(sd->userid, auth_dat[i].userid) == 0 );
 
-	// if strict account search fails, we do a no sensitive case research for index
-	if( i < auth_num )
-	{
-		i = search_account_index(sd->userid);
-		if( i == -1 )
-			i = auth_num;
-		else
-			memcpy(sd->userid, auth_dat[i].userid, NAME_LENGTH); // for the possible tests/checks afterwards (copy correcte sensitive case).
-	}
+	ShowStatus("Read information about %d subnetworks.\n", subnet_count);
 
-	if( i == auth_num )
-	{
-		ShowNotice("Unknown account (account: %s, received pass: %s, ip: %s)\n", sd->userid, sd->passwd, ip);
-		return 0; // 0 = Unregistered ID
-	}
+	fclose(fp);
+	return 0;
+}
 
-	if( login_config.use_md5_passwds )
-		MD5_String(sd->passwd, user_password);
-	else
-		safestrncpy(user_password, sd->passwd, NAME_LENGTH);
+//-----------------------
+// Console Command Parser [Wizputer]
+//-----------------------
+int parse_console(char* buf)
+{
+	char command[256];
 
-	if( !check_password(sd, sd->passwdenc, user_password, auth_dat[i].pass) )
-	{
-		ShowNotice("Invalid password (account: %s, pass: %s, received pass: %s, ip: %s)\n", sd->userid, auth_dat[i].pass, (sd->passwdenc) ? "[MD5]" : sd->passwd, ip);
-		return 1; // 1 = Incorrect Password
-	}
+	memset(command, 0, sizeof(command));
 
-	if( auth_dat[i].expiration_time != 0 && auth_dat[i].expiration_time < time(NULL) )
-	{
-		ShowNotice("Connection refused (account: %s, pass: %s, expired ID, ip: %s)\n", sd->userid, sd->passwd, ip);
-		return 2; // 2 = This ID is expired
-	}
+	sscanf(buf, "%[^\n]", command);
 
-	if( auth_dat[i].unban_time != 0 && auth_dat[i].unban_time > time(NULL) )
-	{
-		strftime(tmpstr, 20, login_config.date_format, localtime(&auth_dat[i].unban_time));
-		tmpstr[19] = '\0';
-		ShowNotice("Connection refused (account: %s, pass: %s, banned until %s, ip: %s)\n", sd->userid, sd->passwd, tmpstr, ip);
-		return 6; // 6 = Your are Prohibited to log in until %s
-	}
+	ShowInfo("Console command :%s", command);
 
-	if( auth_dat[i].state )
-	{
-		ShowNotice("Connection refused (account: %s, pass: %s, state: %d, ip: %s)\n", sd->userid, sd->passwd, auth_dat[i].state, ip);
-		return auth_dat[i].state - 1;
+	if( strcmpi("shutdown", command) == 0 ||
+	    strcmpi("exit", command) == 0 ||
+	    strcmpi("quit", command) == 0 ||
+	    strcmpi("end", command) == 0 )
+		runflag = 0;
+	else
+	if( strcmpi("alive", command) == 0 ||
+	    strcmpi("status", command) == 0 )
+		ShowInfo(CL_CYAN"Console: "CL_BOLD"I'm Alive."CL_RESET"\n");
+	else
+	if( strcmpi("help", command) == 0 ) {
+		ShowInfo(CL_BOLD"Help of commands:"CL_RESET"\n");
+		ShowInfo("  To shutdown the server:\n");
+		ShowInfo("  'shutdown|exit|quit|end'\n");
+		ShowInfo("  To know if server is alive:\n");
+		ShowInfo("  'alive|status'\n");
 	}
 
-	ShowNotice("Authentication accepted (account: %s, id: %d, ip: %s)\n", sd->userid, auth_dat[i].account_id, ip);
-
-	// auth start : time seed
-	time(&raw_time);
-	strftime(tmpstr, 24, "%Y-%m-%d %H:%M:%S",localtime(&raw_time));
-
-	sd->account_id = auth_dat[i].account_id;
-	sd->login_id1 = rand();
-	sd->login_id2 = rand();
-	safestrncpy(sd->lastlogin, auth_dat[i].lastlogin, 24);
-	sd->sex = auth_dat[i].sex;
-
-	if( sd->sex != 'S' && sd->account_id < START_ACCOUNT_NUM )
-		ShowWarning("Account %s has account id %d! Account IDs must be over %d to work properly!\n", sd->userid, sd->account_id, START_ACCOUNT_NUM);
-
-	safestrncpy(auth_dat[i].lastlogin, tmpstr, sizeof(auth_dat[i].lastlogin));
-	safestrncpy(auth_dat[i].last_ip, ip, sizeof(auth_dat[i].last_ip));
-	auth_dat[i].unban_time = 0;
-	auth_dat[i].logincount++;
-
-	// Save until for change ip/time of auth is not very useful => limited save for that
-	// Save there informations isnot necessary, because they are saved in log file.
-	if (--auth_before_save_file <= 0) // Reduce counter. 0 or less, we save
-		mmo_auth_sync();
-
-	return -1; // account OK
-}
-
-static int online_db_setoffline(DBKey key, void* data, va_list ap)
-{
-	struct online_login_data* p = (struct online_login_data*)data;
-	int server = va_arg(ap, int);
-	if( server == -1 )
-	{
-		p->char_server = -1;
-		if( p->waiting_disconnect != -1 )
-		{
-			delete_timer(p->waiting_disconnect, waiting_disconnect_timer);
-			p->waiting_disconnect = -1;
-		}
-	}
-	else if( p->char_server == server )
-		p->char_server = -2; //Char server disconnected.
 	return 0;
 }
 
+
 //--------------------------------
 // Packet parsing for char-servers
 //--------------------------------
 int parse_fromchar(int fd)
 {
-	unsigned int i;
 	int j, id;
 	uint32 ipl;
 	char ip[16];
@@ -1117,14 +398,6 @@ int parse_fromchar(int fd)
 		switch( command )
 		{
 
-		case 0x2709: // request from map-server via char-server to reload GM accounts
-			RFIFOSKIP(fd,2);
-			ShowStatus("Char-server '%s': Request to re-load GM configuration file (ip: %s).\n", server[id].name, ip);
-			read_gm_account();
-			// send GM accounts to all char-servers
-			send_GM_accounts(-1);
-		break;
-
 		case 0x2712: // request from char-server to authenticate an account
 			if( RFIFOREST(fd) < 19 )
 				return 0;
@@ -1132,8 +405,8 @@ int parse_fromchar(int fd)
 			struct auth_node* node;
 
 			int account_id = RFIFOL(fd,2);
-			int login_id1 = RFIFOL(fd,6);
-			int login_id2 = RFIFOL(fd,10);
+			uint32 login_id1 = RFIFOL(fd,6);
+			uint32 login_id2 = RFIFOL(fd,10);
 			char sex = sex_num2str(RFIFOB(fd,14));
 			uint32 ip_ = ntohl(RFIFOL(fd,15));
 			RFIFOSKIP(fd,19);
@@ -1146,51 +419,49 @@ int parse_fromchar(int fd)
 				node->sex        == sex &&
 				node->ip         == ip_ )
 			{// found
-				uint32 expiration_time;
-				char email[40];
-				unsigned int k;
+				struct mmo_account acc;
+				time_t expiration_time = 0;
+				const char* email = "";
+				int gmlevel = 0;
 
 				//ShowStatus("Char-server '%s': authentication of the account %d accepted (ip: %s).\n", server[id].name, account_id, ip);
 
 				// each auth entry can only be used once
 				idb_remove(auth_db, account_id);
 
-				// retrieve email and account expiration time
-				ARR_FIND( 0, auth_num, k, auth_dat[k].account_id == account_id );
-				if( k < auth_num )
-				{
-					strcpy(email, auth_dat[k].email);
-					expiration_time = (uint32)auth_dat[k].expiration_time;
-				}
-				else
+				// retrieve email and account expiration time and gm level
+				if( accounts->load_num(accounts, &acc, account_id) )
 				{
-					memset(email, 0, sizeof(email));
-					expiration_time = 0;
+					email = acc.email;
+					expiration_time = acc.expiration_time;
+					gmlevel = acc.level;
 				}
 
 				// send ack
-				WFIFOHEAD(fd,59);
+				WFIFOHEAD(fd,60);
 				WFIFOW(fd,0) = 0x2713;
 				WFIFOL(fd,2) = account_id;
 				WFIFOL(fd,6) = login_id1;
 				WFIFOL(fd,10) = login_id2;
 				WFIFOB(fd,14) = 0;
-				memcpy(WFIFOP(fd,15), email, 40);
-				WFIFOL(fd,55) = expiration_time;
-				WFIFOSET(fd,59);
+				safestrncpy((char*)WFIFOP(fd,15), email, 40);
+				WFIFOL(fd,55) = (uint32)expiration_time;
+				WFIFOB(fd,59) = gmlevel;
+				WFIFOSET(fd,60);
 			}
 			else
 			{// authentication not found
 				ShowStatus("Char-server '%s': authentication of the account %d REFUSED (ip: %s).\n", server[id].name, account_id, ip);
-				WFIFOHEAD(fd,59);
+				WFIFOHEAD(fd,60);
 				WFIFOW(fd,0) = 0x2713;
 				WFIFOL(fd,2) = account_id;
 				WFIFOL(fd,6) = login_id1;
 				WFIFOL(fd,10) = login_id2;
 				WFIFOB(fd,14) = 1;
-				// It is unnecessary to send email
-				// It is unnecessary to send validity date of the account
-				WFIFOSET(fd,59);
+				//safestrncpy((char*)WFIFOP(fd,15), "", 40);
+				//WFIFOL(fd,55) = (uint32)0;
+				//WFIFOB(fd,59) = 0;
+				WFIFOSET(fd,60);
 			}
 		}
 		break;
@@ -1216,25 +487,23 @@ int parse_fromchar(int fd)
 			if (RFIFOREST(fd) < 46)
 				return 0;
 		{
+			struct mmo_account acc;
 			char email[40];
-			int acc = RFIFOL(fd,2);
+
+			int account_id = RFIFOL(fd,2);
 			safestrncpy(email, (char*)RFIFOP(fd,6), 40); remove_control_chars(email);
 			RFIFOSKIP(fd,46);
 
 			if( e_mail_check(email) == 0 )
-				ShowNotice("Char-server '%s': Attempt to create an e-mail on an account with a default e-mail REFUSED - e-mail is invalid (account: %d, ip: %s)\n", server[id].name, acc, ip);
+				ShowNotice("Char-server '%s': Attempt to create an e-mail on an account with a default e-mail REFUSED - e-mail is invalid (account: %d, ip: %s)\n", server[id].name, account_id, ip);
 			else
-			{
-				ARR_FIND( 0, auth_num, i, auth_dat[i].account_id == acc && (strcmp(auth_dat[i].email, "a@a.com") == 0 || auth_dat[i].email[0] == '\0') );
-				if( i == auth_num )
-					ShowNotice("Char-server '%s': Attempt to create an e-mail on an account with a default e-mail REFUSED - account doesn't exist or e-mail of account isn't default e-mail (account: %d, ip: %s).\n", server[id].name, acc, ip);
-				else
-				{
-					memcpy(auth_dat[i].email, email, 40);
-					ShowNotice("Char-server '%s': Create an e-mail on an account with a default e-mail (account: %d, new e-mail: %s, ip: %s).\n", server[id].name, acc, email, ip);
-					// Save
-					mmo_auth_sync();
-				}
+			if( !accounts->load_num(accounts, &acc, account_id) || strcmp(acc.email, "a@a.com") == 0 || acc.email[0] == '\0' )
+				ShowNotice("Char-server '%s': Attempt to create an e-mail on an account with a default e-mail REFUSED - account doesn't exist or e-mail of account isn't default e-mail (account: %d, ip: %s).\n", server[id].name, account_id, ip);
+			else {
+				memcpy(acc.email, email, 40);
+				ShowNotice("Char-server '%s': Create an e-mail on an account with a default e-mail (account: %d, new e-mail: %s, ip: %s).\n", server[id].name, account_id, email, ip);
+				// Save
+				accounts->save(accounts, &acc);
 			}
 		}
 		break;
@@ -1243,27 +512,30 @@ int parse_fromchar(int fd)
 			if( RFIFOREST(fd) < 6 )
 				return 0;
 		{
-			uint32 expiration_time = 0;
+			struct mmo_account acc;
+			time_t expiration_time = 0;
 			char email[40] = "";
+			int gmlevel = 0;
 
 			int account_id = RFIFOL(fd,2);
 			RFIFOSKIP(fd,6);
 
-			ARR_FIND( 0, auth_num, i, auth_dat[i].account_id == account_id );
-			if( i == auth_num )
-				ShowNotice("Char-server '%s': e-mail of the account %d NOT found (ip: %s).\n", server[id].name, RFIFOL(fd,2), ip);
+			if( !accounts->load_num(accounts, &acc, account_id) )
+				ShowNotice("Char-server '%s': e-mail of the account %d NOT found (ip: %s).\n", server[id].name, account_id, ip);
 			else
 			{
-				safestrncpy(email, auth_dat[i].email, sizeof(email));
-				expiration_time = (uint32)auth_dat[i].expiration_time;
+				safestrncpy(email, acc.email, sizeof(email));
+				expiration_time = acc.expiration_time;
+				gmlevel = acc.level;
 			}
 
-			WFIFOHEAD(fd,50);
+			WFIFOHEAD(fd,51);
 			WFIFOW(fd,0) = 0x2717;
 			WFIFOL(fd,2) = account_id;
 			safestrncpy((char*)WFIFOP(fd,6), email, 40);
-			WFIFOL(fd,46) = expiration_time;
-			WFIFOSET(fd,50);
+			WFIFOL(fd,46) = (uint32)expiration_time;
+			WFIFOB(fd,50) = gmlevel;
+			WFIFOSET(fd,51);
 		}
 		break;
 
@@ -1282,32 +554,34 @@ int parse_fromchar(int fd)
 			if (RFIFOREST(fd) < 86)
 				return 0;
 		{
+			struct mmo_account acc;
 			char actual_email[40];
 			char new_email[40];
+
 			int account_id = RFIFOL(fd,2);
-			safestrncpy(actual_email, (char*)RFIFOP(fd,6), 40); remove_control_chars(actual_email);
-			safestrncpy(new_email, (char*)RFIFOP(fd,46), 40); remove_control_chars(new_email);
+			safestrncpy(actual_email, (char*)RFIFOP(fd,6), 40);
+			safestrncpy(new_email, (char*)RFIFOP(fd,46), 40);
 			RFIFOSKIP(fd, 86);
 
 			if( e_mail_check(actual_email) == 0 )
 				ShowNotice("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command), but actual email is invalid (account: %d, ip: %s)\n", server[id].name, account_id, ip);
-			else if( e_mail_check(new_email) == 0 )
+			else
+			if( e_mail_check(new_email) == 0 )
 				ShowNotice("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command) with a invalid new e-mail (account: %d, ip: %s)\n", server[id].name, account_id, ip);
-			else if( strcmpi(new_email, "a@a.com") == 0 )
+			else
+			if( strcmpi(new_email, "a@a.com") == 0 )
 				ShowNotice("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command) with a default e-mail (account: %d, ip: %s)\n", server[id].name, account_id, ip);
+			else
+			if( !accounts->load_num(accounts, &acc, account_id) )
+				ShowNotice("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command), but account doesn't exist (account: %d, ip: %s).\n", server[id].name, account_id, ip);
+			else
+			if( strcmpi(acc.email, actual_email) != 0 )
+				ShowNotice("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command), but actual e-mail is incorrect (account: %d (%s), actual e-mail: %s, proposed e-mail: %s, ip: %s).\n", server[id].name, account_id, acc.userid, acc.email, actual_email, ip);
 			else {
-				ARR_FIND( 0, auth_num, i, auth_dat[i].account_id == account_id );
-				if( i == auth_num )
-					ShowNotice("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command), but account doesn't exist (account: %d, ip: %s).\n", server[id].name, account_id, ip);
-				else
-				if( strcmpi(auth_dat[i].email, actual_email) != 0 )
-					ShowNotice("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command), but actual e-mail is incorrect (account: %d (%s), actual e-mail: %s, proposed e-mail: %s, ip: %s).\n", server[id].name, account_id, auth_dat[i].userid, auth_dat[i].email, actual_email, ip);
-				else {
-					safestrncpy(auth_dat[i].email, new_email, 40);
-					ShowNotice("Char-server '%s': Modify an e-mail on an account (@email GM command) (account: %d (%s), new e-mail: %s, ip: %s).\n", server[id].name, account_id, auth_dat[i].userid, new_email, ip);
-					// Save
-					mmo_auth_sync();
-				}
+				safestrncpy(acc.email, new_email, 40);
+				ShowNotice("Char-server '%s': Modify an e-mail on an account (@email GM command) (account: %d (%s), new e-mail: %s, ip: %s).\n", server[id].name, account_id, acc.userid, new_email, ip);
+				// Save
+				accounts->save(accounts, &acc);
 			}
 		}
 		break;
@@ -1316,18 +590,25 @@ int parse_fromchar(int fd)
 			if (RFIFOREST(fd) < 10)
 				return 0;
 		{
+			struct mmo_account acc;
+
 			int account_id = RFIFOL(fd,2);
-			uint32 state = RFIFOL(fd,6);
+			int state = RFIFOL(fd,6);
 			RFIFOSKIP(fd,10);
 
-			ARR_FIND( 0, auth_num, i, auth_dat[i].account_id == account_id );
-			if( i == auth_num )
+			if( !accounts->load_num(accounts, &acc, account_id) )
 				ShowNotice("Char-server '%s': Error of Status change (account: %d not found, suggested status %d, ip: %s).\n", server[id].name, account_id, state, ip);
 			else
-			if( auth_dat[i].state == state )
+			if( acc.state == state )
 				ShowNotice("Char-server '%s':  Error of Status change - actual status is already the good status (account: %d, status %d, ip: %s).\n", server[id].name, account_id, state, ip);
 			else {
 				ShowNotice("Char-server '%s': Status change (account: %d, new status %d, ip: %s).\n", server[id].name, account_id, state, ip);
+
+				acc.state = state;
+				// Save
+				accounts->save(accounts, &acc);
+
+				// notify other servers
 				if (state != 0) {
 					uint8 buf[11];
 					WBUFW(buf,0) = 0x2731;
@@ -1336,9 +617,6 @@ int parse_fromchar(int fd)
 					WBUFL(buf,7) = state; // status or final date of a banishment
 					charif_sendallwos(-1, buf, 11);
 				}
-				auth_dat[i].state = state;
-				// Save
-				mmo_auth_sync();
 			}
 		}
 		break;
@@ -1347,6 +625,8 @@ int parse_fromchar(int fd)
 			if (RFIFOREST(fd) < 18)
 				return 0;
 		{
+			struct mmo_account acc;
+
 			int account_id = RFIFOL(fd,2);
 			int year = (short)RFIFOW(fd,6);
 			int month = (short)RFIFOW(fd,8);
@@ -1356,24 +636,23 @@ int parse_fromchar(int fd)
 			int sec = (short)RFIFOW(fd,16);
 			RFIFOSKIP(fd,18);
 
-			ARR_FIND( 0, auth_num, i, auth_dat[i].account_id == account_id );
-			if( i == auth_num )
+			if( !accounts->load_num(accounts, &acc, account_id) )
 				ShowNotice("Char-server '%s': Error of ban request (account: %d not found, ip: %s).\n", server[id].name, account_id, ip);
 			else
 			{
 				time_t timestamp;
 				struct tm *tmtime;
-				if (auth_dat[i].unban_time == 0 || auth_dat[i].unban_time < time(NULL))
-					timestamp = time(NULL);
+				if (acc.unban_time == 0 || acc.unban_time < time(NULL))
+					timestamp = time(NULL); // new ban
 				else
-					timestamp = auth_dat[i].unban_time;
+					timestamp = acc.unban_time; // add to existing ban
 				tmtime = localtime(&timestamp);
 				tmtime->tm_year = tmtime->tm_year + year;
-				tmtime->tm_mon = tmtime->tm_mon + month;
+				tmtime->tm_mon  = tmtime->tm_mon + month;
 				tmtime->tm_mday = tmtime->tm_mday + mday;
 				tmtime->tm_hour = tmtime->tm_hour + hour;
-				tmtime->tm_min = tmtime->tm_min + min;
-				tmtime->tm_sec = tmtime->tm_sec + sec;
+				tmtime->tm_min  = tmtime->tm_min + min;
+				tmtime->tm_sec  = tmtime->tm_sec + sec;
 				timestamp = mktime(tmtime);
 				if (timestamp == -1)
 					ShowNotice("Char-server '%s': Error of ban request (account: %d, invalid date, ip: %s).\n", server[id].name, account_id, ip);
@@ -1382,18 +661,21 @@ int parse_fromchar(int fd)
 					ShowNotice("Char-server '%s': Error of ban request (account: %d, new date unbans the account, ip: %s).\n", server[id].name, account_id, ip);
 				else
 				{
-					unsigned char buf[16];
-					char tmpstr[2048];
-					strftime(tmpstr, 24, login_config.date_format, localtime(&timestamp));
+					uint8 buf[11];
+					char tmpstr[24];
+					timestamp2string(tmpstr, sizeof(tmpstr), timestamp, login_config.date_format);
 					ShowNotice("Char-server '%s': Ban request (account: %d, new final date of banishment: %d (%s), ip: %s).\n", server[id].name, account_id, timestamp, tmpstr, ip);
+
+					acc.unban_time = timestamp;
+
+					// Save
+					accounts->save(accounts, &acc);
+
 					WBUFW(buf,0) = 0x2731;
-					WBUFL(buf,2) = auth_dat[i].account_id;
+					WBUFL(buf,2) = account_id;
 					WBUFB(buf,6) = 1; // 0: change of status, 1: ban
-					WBUFL(buf,7) = (unsigned int)timestamp; // status or final date of a banishment
+					WBUFL(buf,7) = (uint32)timestamp; // status or final date of a banishment
 					charif_sendallwos(-1, buf, 11);
-					auth_dat[i].unban_time = timestamp;
-					// Save
-					mmo_auth_sync();
 				}
 			}
 		}
@@ -1403,29 +685,32 @@ int parse_fromchar(int fd)
 			if( RFIFOREST(fd) < 6 )
 				return 0;
 		{
+			struct mmo_account acc;
+
 			int account_id = RFIFOL(fd,2);
 			RFIFOSKIP(fd,6);
 
-			ARR_FIND( 0, auth_num, i, auth_dat[i].account_id == account_id );
-			if( i == auth_num )
+			if( !accounts->load_num(accounts, &acc, account_id) )
 				ShowNotice("Char-server '%s': Error of sex change (account: %d not found, ip: %s).\n", server[id].name, account_id, ip);
 			else
-			if( auth_dat[i].sex == 'S' )
+			if( acc.sex == 'S' )
 				ShowNotice("Char-server '%s': Error of sex change - account to change is a Server account (account: %d, ip: %s).\n", server[id].name, account_id, ip);
 			else
 			{
 				unsigned char buf[7];
-				char sex = ( auth_dat[i].sex == 'M' ) ? 'F' : 'M'; //Change gender
-
-				auth_dat[i].sex = sex;
+				char sex = ( acc.sex == 'M' ) ? 'F' : 'M'; //Change gender
 
 				ShowNotice("Char-server '%s': Sex change (account: %d, new sex %c, ip: %s).\n", server[id].name, account_id, sex, ip);
+
+				acc.sex = sex;
+				// Save
+				accounts->save(accounts, &acc);
+
+				// announce to other servers
 				WBUFW(buf,0) = 0x2723;
 				WBUFL(buf,2) = account_id;
 				WBUFB(buf,6) = sex_str2num(sex);
 				charif_sendallwos(-1, buf, 7);
-				// Save
-				mmo_auth_sync();
 			}
 		}
 		break;
@@ -1434,37 +719,38 @@ int parse_fromchar(int fd)
 			if( RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2) )
 				return 0;
 		{
-			int acc = RFIFOL(fd,4);
+			struct mmo_account acc;
+
+			int account_id = RFIFOL(fd,4);
 
-			ARR_FIND( 0, auth_num, i, auth_dat[i].account_id == acc );
-			if( i == auth_num )
-				ShowStatus("Char-server '%s': receiving (from the char-server) of account_reg2 (account: %d not found, ip: %s).\n", server[id].name, acc, ip);
+			if( !accounts->load_num(accounts, &acc, account_id) )
+				ShowStatus("Char-server '%s': receiving (from the char-server) of account_reg2 (account: %d not found, ip: %s).\n", server[id].name, account_id, ip);
 			else
 			{
 				int len;
 				int p;
-				ShowNotice("char-server '%s': receiving (from the char-server) of account_reg2 (account: %d, ip: %s).\n", server[id].name, acc, ip);
-				for(j=0,p=13;j<ACCOUNT_REG2_NUM && p<RFIFOW(fd,2);j++){
-					sscanf((char*)RFIFOP(fd,p), "%31c%n",auth_dat[i].account_reg2[j].str,&len);
-					auth_dat[i].account_reg2[j].str[len]='\0';
+				ShowNotice("char-server '%s': receiving (from the char-server) of account_reg2 (account: %d, ip: %s).\n", server[id].name, account_id, ip);
+				for( j = 0, p = 13; j < ACCOUNT_REG2_NUM && p < RFIFOW(fd,2); ++j )
+				{
+					sscanf((char*)RFIFOP(fd,p), "%31c%n", acc.account_reg2[j].str, &len);
+					acc.account_reg2[j].str[len]='\0';
 					p +=len+1; //+1 to skip the '\0' between strings.
-					sscanf((char*)RFIFOP(fd,p), "%255c%n",auth_dat[i].account_reg2[j].value,&len);
-					auth_dat[i].account_reg2[j].value[len]='\0';
+					sscanf((char*)RFIFOP(fd,p), "%255c%n", acc.account_reg2[j].value, &len);
+					acc.account_reg2[j].value[len]='\0';
 					p +=len+1;
-					remove_control_chars(auth_dat[i].account_reg2[j].str);
-					remove_control_chars(auth_dat[i].account_reg2[j].value);
+					remove_control_chars(acc.account_reg2[j].str);
+					remove_control_chars(acc.account_reg2[j].value);
 				}
-				auth_dat[i].account_reg2_num = j;
+				acc.account_reg2_num = j;
+
+				// Save
+				accounts->save(accounts, &acc);
 
 				// Sending information towards the other char-servers.
 				RFIFOW(fd,0) = 0x2729;// reusing read buffer
 				charif_sendallwos(fd, RFIFOP(fd,0), RFIFOW(fd,2));
 				RFIFOSKIP(fd,RFIFOW(fd,2));
-
-				// Save
-				mmo_auth_sync();
 			}
-
 		}
 		break;
 
@@ -1472,19 +758,21 @@ int parse_fromchar(int fd)
 			if( RFIFOREST(fd) < 6 )
 				return 0;
 		{
+			struct mmo_account acc;
+
 			int account_id = RFIFOL(fd,2);
 			RFIFOSKIP(fd,6);
 
-			ARR_FIND( 0, auth_num, i, auth_dat[i].account_id == account_id );
-			if( i == auth_num )
+			if( !accounts->load_num(accounts, &acc, account_id) )
 				ShowNotice("Char-server '%s': Error of UnBan request (account: %d not found, ip: %s).\n", server[id].name, account_id, ip);
 			else
-			if( auth_dat[i].unban_time == 0 )
+			if( acc.unban_time == 0 )
 				ShowNotice("Char-server '%s': Error of UnBan request (account: %d, no change for unban date, ip: %s).\n", server[id].name, account_id, ip);
 			else
 			{
-				auth_dat[i].unban_time = 0;
 				ShowNotice("Char-server '%s': UnBan request (account: %d, ip: %s).\n", server[id].name, account_id, ip);
+				acc.unban_time = 0;
+				accounts->save(accounts, &acc);
 			}
 		}
 		break;
@@ -1531,39 +819,32 @@ int parse_fromchar(int fd)
 			if (RFIFOREST(fd) < 10)
 				return 0;
 		{
+			struct mmo_account acc;
 			size_t off;
 
 			int account_id = RFIFOL(fd,2);
 			int char_id = RFIFOL(fd,6);
 			RFIFOSKIP(fd,10);
 
-			WFIFOHEAD(fd,10000);
+			WFIFOHEAD(fd,ACCOUNT_REG2_NUM*sizeof(struct global_reg));
 			WFIFOW(fd,0) = 0x2729;
 			WFIFOL(fd,4) = account_id;
 			WFIFOL(fd,8) = char_id;
 			WFIFOB(fd,12) = 1; //Type 1 for Account2 registry
 
-			ARR_FIND( 0, auth_num, i, auth_dat[i].account_id == account_id );
-			if( i == auth_num )
+			off = 13;
+			if( accounts->load_num(accounts, &acc, account_id) )
 			{
-				//Account not found? Send at least empty data, map servers need a reply!
-				WFIFOW(fd,2) = 13;
-				WFIFOSET(fd,WFIFOW(fd,2));
-				break;
-			}
-
-			for( off = 13, j = 0; j < auth_dat[i].account_reg2_num && off < 9000; j++ )
-			{
-				if( auth_dat[i].account_reg2[j].str[0] != '\0' )
+				for( j = 0; j < acc.account_reg2_num; j++ )
 				{
-					off += sprintf((char*)WFIFOP(fd,off), "%s", auth_dat[i].account_reg2[j].str)+1; //We add 1 to consider the '\0' in place.
-					off += sprintf((char*)WFIFOP(fd,off), "%s", auth_dat[i].account_reg2[j].value)+1;
+					if( acc.account_reg2[j].str[0] != '\0' )
+					{
+						off += sprintf((char*)WFIFOP(fd,off), "%s", acc.account_reg2[j].str)+1; //We add 1 to consider the '\0' in place.
+						off += sprintf((char*)WFIFOP(fd,off), "%s", acc.account_reg2[j].value)+1;
+					}
 				}
 			}
 
-			if( off >= 9000 )
-				ShowWarning("Too many account2 registries for AID %d. Some registries were not sent.\n", account_id);
-
 			WFIFOW(fd,2) = (uint16)off;
 			WFIFOSET(fd,WFIFOW(fd,2));
 		}
@@ -1594,14 +875,177 @@ int parse_fromchar(int fd)
 	return 0;
 }
 
-//--------------------------------------------
-// Test to know if an IP come from LAN or WAN.
-//--------------------------------------------
-int lan_subnetcheck(uint32 ip)
+
+//-------------------------------------
+// Make new account
+//-------------------------------------
+int mmo_auth_new(const char* userid, const char* pass, const char sex, const char* last_ip)
 {
-	int i;
-	ARR_FIND( 0, subnet_count, i, (subnet[i].char_ip & subnet[i].mask) == (ip & subnet[i].mask) );
-	return ( i < subnet_count ) ? subnet[i].char_ip : 0;
+	static int num_regs = 0; // registration counter
+	static unsigned int new_reg_tick = 0;
+	unsigned int tick = gettick();
+	struct mmo_account acc;
+
+	//Account Registration Flood Protection by [Kevin]
+	if( new_reg_tick == 0 )
+		new_reg_tick = gettick();
+	if( DIFF_TICK(tick, new_reg_tick) < 0 && num_regs >= allowed_regs )
+	{
+		ShowNotice("Account registration denied (registration limit exceeded)\n");
+		return 3;
+	}
+
+	// check for invalid inputs
+	if( sex != 'M' && sex != 'F' )
+		return 0; // 0 = Unregistered ID
+
+	// check if the account doesn't exist already
+	if( accounts->load_str(accounts, &acc, userid) )
+	{
+		ShowNotice("Attempt of creation of an already existant account (account: %s_%c, pass: %s, received pass: %s)\n", userid, sex, acc.pass, pass);
+		return 1; // 1 = Incorrect Password
+	}
+
+	memset(&acc, '\0', sizeof(acc));
+	acc.account_id = -1; // assigned by account db
+	safestrncpy(acc.userid, userid, sizeof(acc.userid));
+	safestrncpy(acc.pass, pass, sizeof(acc.pass));
+	acc.sex = sex;
+	safestrncpy(acc.email, "a@a.com", sizeof(acc.email));
+	acc.expiration_time = ( login_config.start_limited_time != -1 ) ? time(NULL) + login_config.start_limited_time : 0;
+	safestrncpy(acc.lastlogin, "-", sizeof(acc.lastlogin));
+	safestrncpy(acc.last_ip, last_ip, sizeof(acc.last_ip));
+
+	if( !accounts->create(accounts, &acc) )
+		return 0;
+
+	ShowNotice("Account creation (account %s, id: %d, pass: %s, sex: %c)\n", acc.userid, acc.account_id, acc.pass, acc.sex);
+
+	if( DIFF_TICK(tick, new_reg_tick) > 0 )
+	{// Update the registration check.
+		num_regs = 0;
+		new_reg_tick = tick + time_allowed*1000;
+	}
+	++num_regs;
+
+	return -1;
+}
+
+//-----------------------------------------------------
+// Check/authentication of a connection
+//-----------------------------------------------------
+int mmo_auth(struct login_session_data* sd)
+{
+	struct mmo_account acc;
+	int len;
+
+	char ip[16];
+	ip2str(session[sd->fd]->client_addr, ip);
+
+	// DNS Blacklist check
+	if( login_config.use_dnsbl )
+	{
+		char r_ip[16];
+		char ip_dnsbl[256];
+		char* dnsbl_serv;
+		bool matched = false;
+		uint8* sin_addr = (uint8*)&session[sd->fd]->client_addr;
+
+		sprintf(r_ip, "%u.%u.%u.%u", sin_addr[0], sin_addr[1], sin_addr[2], sin_addr[3]);
+
+		for( dnsbl_serv = strtok(login_config.dnsbl_servs,","); !matched && dnsbl_serv != NULL; dnsbl_serv = strtok(NULL,",") )
+		{
+			sprintf(ip_dnsbl, "%s.%s", r_ip, dnsbl_serv);
+			if( host2ip(ip_dnsbl) )
+				matched = true;
+		}
+
+		if( matched )
+		{
+			ShowInfo("DNSBL: (%s) Blacklisted. User Kicked.\n", r_ip);
+			return 3;
+		}
+	}
+
+	//Client Version check
+	if( login_config.check_client_version && sd->version != login_config.client_version_to_connect )
+		return 5;
+
+	len = strnlen(sd->userid, NAME_LENGTH);
+
+	// Account creation with _M/_F
+	if( login_config.new_account_flag )
+	{
+		if( len > 2 && strnlen(sd->passwd, NAME_LENGTH) > 0 && // valid user and password lengths
+			sd->passwdenc == 0 && // unencoded password
+			sd->userid[len-2] == '_' && memchr("FfMm", sd->userid[len-1], 4) ) // _M/_F suffix
+		{
+			int result;
+
+			// remove the _M/_F suffix
+			len -= 2;
+			sd->userid[len] = '\0';
+
+			result = mmo_auth_new(sd->userid, sd->passwd, TOUPPER(sd->userid[len+1]), ip);
+			if( result != -1 )
+				return result;// Failed to make account. [Skotlex].
+		}
+	}
+	
+	if( !accounts->load_str(accounts, &acc, sd->userid) )
+	{
+		ShowNotice("Unknown account (account: %s, received pass: %s, ip: %s)\n", sd->userid, sd->passwd, ip);
+		return 0; // 0 = Unregistered ID
+	}
+
+	if( !check_password(sd->md5key, sd->passwdenc, sd->passwd, acc.pass) )
+	{
+		ShowNotice("Invalid password (account: '%s', pass: '%s', received pass: '%s', ip: %s)\n", sd->userid, acc.pass, sd->passwd, ip);
+		return 1; // 1 = Incorrect Password
+	}
+
+	if( acc.expiration_time != 0 && acc.expiration_time < time(NULL) )
+	{
+		ShowNotice("Connection refused (account: %s, pass: %s, expired ID, ip: %s)\n", sd->userid, sd->passwd, ip);
+		return 2; // 2 = This ID is expired
+	}
+
+	if( acc.unban_time != 0 && acc.unban_time > time(NULL) )
+	{
+		char tmpstr[24];
+		timestamp2string(tmpstr, sizeof(tmpstr), acc.unban_time, login_config.date_format);
+		ShowNotice("Connection refused (account: %s, pass: %s, banned until %s, ip: %s)\n", sd->userid, sd->passwd, tmpstr, ip);
+		return 6; // 6 = Your are Prohibited to log in until %s
+	}
+
+	if( acc.state != 0 )
+	{
+		ShowNotice("Connection refused (account: %s, pass: %s, state: %d, ip: %s)\n", sd->userid, sd->passwd, acc.state, ip);
+		return acc.state - 1;
+	}
+
+	ShowNotice("Authentication accepted (account: %s, id: %d, ip: %s)\n", sd->userid, acc.account_id, ip);
+
+	// update session data
+	sd->account_id = acc.account_id;
+	sd->login_id1 = rand();
+	sd->login_id2 = rand();
+	safestrncpy(sd->lastlogin, acc.lastlogin, sizeof(sd->lastlogin));
+	sd->sex = acc.sex;
+	sd->level = acc.level;
+
+	// update account data
+	timestamp2string(acc.lastlogin, sizeof(acc.lastlogin), time(NULL), login_config.date_format);
+	safestrncpy(acc.last_ip, ip, sizeof(acc.last_ip));
+	acc.unban_time = 0;
+	acc.logincount++;
+
+	accounts->save(accounts, &acc);
+
+	if( sd->sex != 'S' && sd->account_id < START_ACCOUNT_NUM )
+		ShowWarning("Account %s has account id %d! Account IDs must be over %d to work properly!\n", sd->userid, sd->account_id, START_ACCOUNT_NUM);
+
+	return -1; // account OK
 }
 
 void login_auth_ok(struct login_session_data* sd)
@@ -1614,8 +1058,6 @@ void login_auth_ok(struct login_session_data* sd)
 	struct auth_node* node;
 	int i;
 
-	sd->level = isGM(sd->account_id);
-
 	if( sd->level < login_config.min_level_to_connect )
 	{
 		ShowStatus("Connection refused: the minimum GM level for connection is %d (account: %s, GM level: %d).\n", login_config.min_level_to_connect, sd->userid, sd->level);
@@ -1673,6 +1115,8 @@ void login_auth_ok(struct login_session_data* sd)
 		}
 	}
 
+	login_log(ip, sd->userid, 100, "login ok");
+
 	if( sd->level > 0 )
 		ShowStatus("Connection of the GM (level:%d) account '%s' accepted.\n", sd->level, sd->userid);
 	else
@@ -1728,6 +1172,42 @@ void login_auth_ok(struct login_session_data* sd)
 void login_auth_failed(struct login_session_data* sd, int result)
 {
 	int fd = sd->fd;
+	uint32 ip = session[fd]->client_addr;
+
+	if (login_config.log_login)
+	{
+		const char* error;
+		switch( result ) {
+		case   0: error = "Unregistered ID."; break; // 0 = Unregistered ID
+		case   1: error = "Incorrect Password."; break; // 1 = Incorrect Password
+		case   2: error = "Account Expired."; break; // 2 = This ID is expired
+		case   3: error = "Rejected from server."; break; // 3 = Rejected from Server
+		case   4: error = "Blocked by GM."; break; // 4 = You have been blocked by the GM Team
+		case   5: error = "Not latest game EXE."; break; // 5 = Your Game's EXE file is not the latest version
+		case   6: error = "Banned."; break; // 6 = Your are Prohibited to log in until %s
+		case   7: error = "Server Over-population."; break; // 7 = Server is jammed due to over populated
+		case   8: error = "Account limit from company"; break; // 8 = No more accounts may be connected from this company
+		case   9: error = "Ban by DBA"; break; // 9 = MSI_REFUSE_BAN_BY_DBA
+		case  10: error = "Email not confirmed"; break; // 10 = MSI_REFUSE_EMAIL_NOT_CONFIRMED
+		case  11: error = "Ban by GM"; break; // 11 = MSI_REFUSE_BAN_BY_GM
+		case  12: error = "Working in DB"; break; // 12 = MSI_REFUSE_TEMP_BAN_FOR_DBWORK
+		case  13: error = "Self Lock"; break; // 13 = MSI_REFUSE_SELF_LOCK
+		case  14: error = "Not Permitted Group"; break; // 14 = MSI_REFUSE_NOT_PERMITTED_GROUP
+		case  15: error = "Not Permitted Group"; break; // 15 = MSI_REFUSE_NOT_PERMITTED_GROUP
+		case  99: error = "Account gone."; break; // 99 = This ID has been totally erased
+		case 100: error = "Login info remains."; break; // 100 = Login information remains at %s
+		case 101: error = "Hacking investigation."; break; // 101 = Account has been locked for a hacking investigation. Please contact the GM Team for more information
+		case 102: error = "Bug investigation."; break; // 102 = This account has been temporarily prohibited from login due to a bug-related investigation
+		case 103: error = "Deleting char."; break; // 103 = This character is being deleted. Login is temporarily unavailable for the time being
+		case 104: error = "Deleting spouse char."; break; // 104 = This character is being deleted. Login is temporarily unavailable for the time being
+		default : error = "Unknown Error."; break;
+		}
+
+		login_log(ip, sd->userid, result, error);
+	}
+
+	if( result == 1 && login_config.dynamic_pass_failure_ban )
+		ipban_log(ip); // log failed password attempt
 
 	WFIFOHEAD(fd,23);
 	WFIFOW(fd,0) = 0x6a;
@@ -1736,39 +1216,54 @@ void login_auth_failed(struct login_session_data* sd, int result)
 		memset(WFIFOP(fd,3), '\0', 20);
 	else
 	{// 6 = Your are Prohibited to log in until %s
-		char tmpstr[20];
-		int i = search_account_index(sd->userid);
-		time_t unban_time = ( i >= 0 ) ? auth_dat[i].unban_time : 0;
-		strftime(tmpstr, 20, login_config.date_format, localtime(&unban_time));
-		safestrncpy((char*)WFIFOP(fd,3), tmpstr, 20); // ban timestamp goes here
+		struct mmo_account acc;
+		time_t unban_time = ( accounts->load_str(accounts, &acc, sd->userid) ) ? acc.unban_time : 0;
+		timestamp2string((char*)WFIFOP(fd,3), 20, unban_time, login_config.date_format);
 	}
 	WFIFOSET(fd,23);
 }
 
+
 //----------------------------------------------------------------------------------------
 // Default packet parsing (normal players or administation/char-server connection requests)
 //----------------------------------------------------------------------------------------
 int parse_login(int fd)
 {
-	struct login_session_data* sd = session[fd]->session_data;
+	struct login_session_data* sd = (struct login_session_data*)session[fd]->session_data;
 	int result;
-	uint32 ipl;
+
 	char ip[16];
+	uint32 ipl = session[fd]->client_addr;
+	ip2str(ipl, ip);
 
 	if( session[fd]->flag.eof )
 	{
+		ShowInfo("Closed connection from '"CL_WHITE"%s"CL_RESET"'.\n", ip);
 		do_close(fd);
 		return 0;
 	}
 
-	if( sd == NULL ) {
-		sd = CREATE(session[fd]->session_data, struct login_session_data, 1);
+	if( sd == NULL )
+	{
+		// Perform ip-ban check
+		if( login_config.ipban && ipban_check(ipl) )
+		{
+			ShowStatus("Connection refused: IP isn't authorised (deny/allow, ip: %s).\n", ip);
+			login_log(ipl, "unknown", -3, "ip banned");
+			WFIFOHEAD(fd,23);
+			WFIFOW(fd,0) = 0x6a;
+			WFIFOB(fd,2) = 3; // 3 = Rejected from Server
+			WFIFOSET(fd,23);
+			set_eof(fd);
+			return 0;
+		}
+
+		// create a session for this new connection
+		CREATE(session[fd]->session_data, struct login_session_data, 1);
+		sd = (struct login_session_data*)session[fd]->session_data;
 		sd->fd = fd;
 	}
 
-	ipl = session[fd]->client_addr;
-	ip2str(ipl, ip);
-
 	while( RFIFOREST(fd) >= 2 )
 	{
 		uint16 command = RFIFOW(fd,0);
@@ -1782,42 +1277,55 @@ int parse_login(int fd)
 			RFIFOSKIP(fd,26);
 		break;
 
-		case 0x0204:		// New alive packet: structure: 0x204 <encrypted.account.userid>.16B. (new ragexe from 22 june 2004)
+		// client md5 hash (binary)
+		case 0x0204: // S 0204 <md5 hash>.16B (kRO 2004-05-31aSakexe langtype 0 and 6)
 			if (RFIFOREST(fd) < 18)
 				return 0;
 			RFIFOSKIP(fd,18);
 		break;
 
-		case 0x0064:		// request client login
-		case 0x01dd:		// request client login (encryption mode)
-		case 0x0277:		// New login packet (kRO 2006-04-24aSakexe langtype 0)
-		case 0x02b0:		// New login packet (kRO 2007-05-14aSakexe langtype 0)
+		// request client login
+		case 0x0064: // S 0064 <version>.l <username>.24B <password>.24B <version2>.B
+		case 0x01dd: // S 01dd <version>.l <username>.24B <md5 hash>.16B <version2>.B
+		case 0x0277: // S 0277 <version>.l <username>.24B <password>.24B <junk?>.29B <version2>.B (kRO 2006-04-24aSakexe langtype 0)
+		case 0x02b0: // S 02b0 <version>.l <username>.24B <password>.24B <???>.B <ip address>.16S <mac address>.13S <version2>.B (kRO 2007-05-14aSakexe langtype 0)
 		{
-			size_t packet_len = RFIFOREST(fd); // assume no other packet was sent
+			size_t packet_len = RFIFOREST(fd);
 
 			if( (command == 0x0064 && packet_len < 55)
 			||  (command == 0x01dd && packet_len < 47)
 			||  (command == 0x0277 && packet_len < 84)
 			||  (command == 0x02b0 && packet_len < 85) )
-				return 0;
-
-			// S 0064 <version>.l <account name>.24B <password>.24B <version2>.B
-			// S 01dd <version>.l <account name>.24B <md5 binary>.16B <version2>.B
-			// S 0277 <version>.l <account name>.24B <password>.24B <junk?>.29B <version2>.B
-			// S 02b0 <version>.l <account name>.24B <password>.24B <junk?>.30B <version2>.B
-
-			sd->version = RFIFOL(fd,2);
-			safestrncpy(sd->userid, (char*)RFIFOP(fd,6), NAME_LENGTH); remove_control_chars(sd->userid);
-			if (command != 0x01dd) {
+			return 0;
+		}
+		{
+			int version = RFIFOL(fd,2);
+			char* userid = (char*)RFIFOP(fd,6);
+			char* passwd = (char*)RFIFOP(fd,30);
+			RFIFOSKIP(fd,RFIFOREST(fd)); // assume no other packet was sent
+
+			sd->version = version;
+			safestrncpy(sd->userid, userid, NAME_LENGTH);
+			if( command != 0x01dd )
+			{
 				ShowStatus("Request for connection of %s (ip: %s).\n", sd->userid, ip);
-				safestrncpy(sd->passwd, (char*)RFIFOP(fd,30), NAME_LENGTH); remove_control_chars(sd->passwd);
+				safestrncpy(sd->passwd, passwd, NAME_LENGTH);
+				if( login_config.use_md5_passwds )
+					MD5_String(sd->passwd, sd->passwd);
 				sd->passwdenc = 0;
-			} else {
+			}
+			else
+			{
 				ShowStatus("Request for connection (encryption mode) of %s (ip: %s).\n", sd->userid, ip);
-				memcpy(sd->passwd, RFIFOP(fd,30), 16); sd->passwd[16] = '\0'; // raw binary data here!
+				memcpy(sd->passwd, passwd, 16); sd->passwd[16] = '\0'; // raw binary data here!
 				sd->passwdenc = PASSWORDENC;
 			}
-			RFIFOSKIP(fd,packet_len);
+
+			if( sd->passwdenc != 0 && login_config.use_md5_passwds )
+			{
+				login_auth_failed(sd, 3); // send "rejected from server"
+				return 0;
+			}
 
 			result = mmo_auth(sd);
 
@@ -1852,25 +1360,26 @@ int parse_login(int fd)
 				return 0;
 		{
 			char server_name[20];
+			char message[256];
 			uint32 server_ip;
 			uint16 server_port;
 			uint16 maintenance;
 			uint16 new_;
 
-			safestrncpy(sd->userid, (char*)RFIFOP(fd,2), NAME_LENGTH); //remove_control_chars(account.userid);
-			safestrncpy(sd->passwd, (char*)RFIFOP(fd,26), NAME_LENGTH); //remove_control_chars(account.passwd);
+			safestrncpy(sd->userid, (char*)RFIFOP(fd,2), NAME_LENGTH);
+			safestrncpy(sd->passwd, (char*)RFIFOP(fd,26), NAME_LENGTH);
 			sd->passwdenc = 0;
 			sd->version = login_config.client_version_to_connect; // hack to skip version check
-
 			server_ip = ntohl(RFIFOL(fd,54));
 			server_port = ntohs(RFIFOW(fd,58));
-
-			safestrncpy(server_name, (char*)RFIFOP(fd,60), 20); remove_control_chars(server_name);
+			safestrncpy(server_name, (char*)RFIFOP(fd,60), 20);
 			maintenance = RFIFOW(fd,82);
 			new_ = RFIFOW(fd,84);
 			RFIFOSKIP(fd,86);
 
-			ShowInfo("Connection request of the char-server '%s' @ %d.%d.%d.%d:%d (account: '%s', pass: '%s', ip: '%s')\n", server_name, CONVIP(server_ip), server_port, sd->userid, sd->passwd, ip);
+			ShowInfo("Connection request of the char-server '%s' @ %u.%u.%u.%u:%u (account: '%s', pass: '%s', ip: '%s')\n", server_name, CONVIP(server_ip), server_port, sd->userid, sd->passwd, ip);
+			sprintf(message, "charserver - %s@%u.%u.%u.%u:%u", server_name, CONVIP(server_ip), server_port);
+			login_log(session[fd]->client_addr, sd->userid, 100, message);
 
 			result = mmo_auth(sd);
 			if( result == -1 && sd->sex == 'S' && sd->account_id < MAX_SERVERS && server[sd->account_id].fd == -1 )
@@ -1893,9 +1402,6 @@ int parse_login(int fd)
 				WFIFOW(fd,0) = 0x2711;
 				WFIFOB(fd,2) = 0;
 				WFIFOSET(fd,3);
-
-				// send GM account to char-server
-				send_GM_accounts(fd);
 			}
 			else
 			{
@@ -1926,57 +1432,25 @@ int parse_login(int fd)
 		case 0x7918:	// Request for administation login
 			if ((int)RFIFOREST(fd) < 4 || (int)RFIFOREST(fd) < ((RFIFOW(fd,2) == 0) ? 28 : 20))
 				return 0;
-			WFIFOW(fd,0) = 0x7919;
-			WFIFOB(fd,2) = 1;
-			if( session[fd]->client_addr != admin_allowed_ip ) {
-				ShowNotice("'ladmin'-login: Connection in administration mode refused: IP isn't authorised (ladmin_allow, ip: %s).\n", ip);
-			} else {
-				struct login_session_data *ld = (struct login_session_data*)session[fd]->session_data;
-				if (RFIFOW(fd,2) == 0) {	// non encrypted password
-					char password[25];
-					memcpy(password, RFIFOP(fd,4), 24);
-					password[24] = '\0';
-					remove_control_chars(password);
-					if( !admin_state )
-						ShowNotice("'ladmin'-login: Connection in administration mode REFUSED - remote administration is disabled (non encrypted password: %s, ip: %s)\n", password, ip);
-					else
-					if( strcmp(password, admin_pass) != 0)
-						ShowNotice("'ladmin'-login: Connection in administration mode REFUSED - invalid password (non encrypted password: %s, ip: %s)\n", password, ip);
-					else {
-						// If remote administration is enabled and password sent by client matches password read from login server configuration file
-						ShowNotice("'ladmin'-login: Connection in administration mode accepted (non encrypted password: %s, ip: %s)\n", password, ip);
-						WFIFOB(fd,2) = 0;
-						session[fd]->func_parse = parse_admin;
-					}
-				} else {	// encrypted password
-					if (!ld)
-						ShowError("'ladmin'-login: error! MD5 key not created/requested for an administration login.\n");
-					else {
-						char md5str[64] = "", md5bin[32];
-						if (RFIFOW(fd,2) == 1) {
-							sprintf(md5str, "%s%s", ld->md5key, admin_pass); // 20 24
-						} else if (RFIFOW(fd,2) == 2) {
-							sprintf(md5str, "%s%s", admin_pass, ld->md5key); // 24 20
-						}
-						MD5_String2binary(md5str, md5bin);
-						if( !admin_state )
-							ShowNotice("'ladmin'-login: Connection in administration mode REFUSED - remote administration is disabled (encrypted password, ip: %s)\n", ip);
-						else
-						if( memcmp(md5bin, RFIFOP(fd,4), 16) != 0 )
-							ShowNotice("'ladmin'-login: Connection in administration mode REFUSED - invalid password (encrypted password, ip: %s)\n", ip);
-						else {
-							// If remote administration is enabled and password hash sent by client matches hash of password read from login server configuration file
-							ShowNotice("'ladmin'-login: Connection in administration mode accepted (encrypted password, ip: %s)\n", ip);
-							ShowNotice("Connection of a remote administration accepted (encrypted password).\n");
-							WFIFOB(fd,2) = 0;
-							session[fd]->func_parse = parse_admin;
-						}
-					}
-				}
+		{
+			int passwdenc = (int)RFIFOW(fd,2);
+			const char* passwd = (char*)RFIFOP(fd,4);
+
+			if( passwdenc == 0 ) { // non encrypted password
+				safestrncpy(sd->passwd, passwd, NAME_LENGTH);
+				sd->passwdenc = 0;
+			} else { // encrypted password
+				memcpy(sd->passwd, passwd, 16); sd->passwd[16] = '\0'; // raw binary data here!
+				sd->passwdenc = passwdenc;
 			}
-			WFIFOSET(fd,3);
 
-			RFIFOSKIP(fd, (RFIFOW(fd,2) == 0) ? 28 : 20);
+			RFIFOSKIP(fd, (passwdenc == 0) ? 28 : 20);
+
+			WFIFOHEAD(fd,3);
+			WFIFOW(fd,0) = 0x7919;
+			WFIFOB(fd,2) = ladmin_auth(sd, ip) ? 0 : 1;
+			WFIFOSET(fd,3);
+		}
 		break;
 
 		default:
@@ -1990,102 +1464,30 @@ int parse_login(int fd)
 	return 0;
 }
 
-//-----------------------
-// Console Command Parser [Wizputer]
-//-----------------------
-int parse_console(char* buf)
-{
-	char command[256];
-
-	memset(command, 0, sizeof(command));
 
-	sscanf(buf, "%[^\n]", command);
-
-	ShowInfo("Console command :%s", command);
-
-	if( strcmpi("shutdown", command) == 0 ||
-	    strcmpi("exit", command) == 0 ||
-	    strcmpi("quit", command) == 0 ||
-	    strcmpi("end", command) == 0 )
-		runflag = 0;
-	else
-	if( strcmpi("alive", command) == 0 ||
-	    strcmpi("status", command) == 0 )
-		ShowInfo(CL_CYAN"Console: "CL_BOLD"I'm Alive."CL_RESET"\n");
-	else
-	if( strcmpi("help", command) == 0 ) {
-		ShowInfo(CL_BOLD"Help of commands:"CL_RESET"\n");
-		ShowInfo("  To shutdown the server:\n");
-		ShowInfo("  'shutdown|exit|quit|end'\n");
-		ShowInfo("  To know if server is alive:\n");
-		ShowInfo("  'alive|status'\n");
-	}
-
-	return 0;
-}
-
-static int online_data_cleanup_sub(DBKey key, void *data, va_list ap)
-{
-	struct online_login_data *character= (struct online_login_data*)data;
-	if (character->char_server == -2) //Unknown server.. set them offline
-		remove_online_user(character->account_id);
-	return 0;
-}
-
-static int online_data_cleanup(int tid, unsigned int tick, int id, intptr data)
-{
-	online_db->foreach(online_db, online_data_cleanup_sub);
-	return 0;
-} 
-
-//----------------------------------
-// Reading Lan Support configuration
-//----------------------------------
-int login_lan_config_read(const char *lancfgName)
+void login_set_defaults()
 {
-	FILE *fp;
-	int line_num = 0;
-	char line[1024], w1[64], w2[64], w3[64], w4[64];
-
-	if((fp = fopen(lancfgName, "r")) == NULL) {
-		ShowWarning("LAN Support configuration file is not found: %s\n", lancfgName);
-		return 1;
-	}
-
-	ShowInfo("Reading the configuration file %s...\n", lancfgName);
-
-	while(fgets(line, sizeof(line), fp))
-	{
-		line_num++;
-		if ((line[0] == '/' && line[1] == '/') || line[0] == '\n' || line[1] == '\n')
-			continue;
-
-		if(sscanf(line,"%[^:]: %[^:]:%[^:]:%[^\r\n]", w1, w2, w3, w4) != 4)
-		{
-			ShowWarning("Error syntax of configuration file %s in line %d.\n", lancfgName, line_num);
-			continue;
-		}
-
-		if( strcmpi(w1, "subnet") == 0 )
-		{
-			subnet[subnet_count].mask = str2ip(w2);
-			subnet[subnet_count].char_ip = str2ip(w3);
-			subnet[subnet_count].map_ip = str2ip(w4);
-
-			if( (subnet[subnet_count].char_ip & subnet[subnet_count].mask) != (subnet[subnet_count].map_ip & subnet[subnet_count].mask) )
-			{
-				ShowError("%s: Configuration Error: The char server (%s) and map server (%s) belong to different subnetworks!\n", lancfgName, w3, w4);
-				continue;
-			}
-
-			subnet_count++;
-		}
-	}
-
-	ShowStatus("Read information about %d subnetworks.\n", subnet_count);
+	login_config.login_ip = INADDR_ANY;
+	login_config.login_port = 6900;
+	login_config.ip_sync_interval = 0;
+	login_config.log_login = true;
+	safestrncpy(login_config.date_format, "%Y-%m-%d %H:%M:%S", sizeof(login_config.date_format));
+	login_config.console = false;
+	login_config.new_account_flag = true;
+	login_config.use_md5_passwds = false;
+	login_config.min_level_to_connect = 0;
+	login_config.online_check = true;
+	login_config.check_client_version = false;
+	login_config.client_version_to_connect = 20;
 
-	fclose(fp);
-	return 0;
+	login_config.ipban = true;
+	login_config.dynamic_pass_failure_ban = true;
+	login_config.dynamic_pass_failure_ban_interval = 5;
+	login_config.dynamic_pass_failure_ban_limit = 7;
+	login_config.dynamic_pass_failure_ban_duration = 5;
+	login_config.use_dnsbl = false;
+	safestrncpy(login_config.dnsbl_servs, "", sizeof(login_config.dnsbl_servs));
+	safestrncpy(login_config.account_engine, "auto", sizeof(login_config.account_engine));
 }
 
 //-----------------------------------
@@ -2129,26 +1531,6 @@ int login_config_read(const char* cfgName)
 		else if(!strcmpi(w1, "log_login"))
 			login_config.log_login = (bool)config_switch(w2);
 
-		else if (strcmpi(w1, "admin_state") == 0) {
-			admin_state = (bool)config_switch(w2);
-		} else if (strcmpi(w1, "admin_pass") == 0) {
-			memset(admin_pass, 0, sizeof(admin_pass));
-			strncpy(admin_pass, w2, sizeof(admin_pass));
-			admin_pass[sizeof(admin_pass)-1] = '\0';
-		} else if (strcmpi(w1, "admin_allowed_ip") == 0)
-			admin_allowed_ip = host2ip(w2);
-		else if (strcmpi(w1, "account_filename") == 0) {
-			memset(account_filename, 0, sizeof(account_filename));
-			strncpy(account_filename, w2, sizeof(account_filename));
-			account_filename[sizeof(account_filename)-1] = '\0';
-		} else if (strcmpi(w1, "gm_account_filename") == 0) {
-			memset(GM_account_filename, 0, sizeof(GM_account_filename));
-			strncpy(GM_account_filename, w2, sizeof(GM_account_filename));
-			GM_account_filename[sizeof(GM_account_filename)-1] = '\0';
-		}
-		else if (strcmpi(w1, "gm_account_filename_check_timer") == 0)
-			gm_account_filename_check_timer = atoi(w2);
-
 		else if(!strcmpi(w1, "new_account"))
 			login_config.new_account_flag = (bool)config_switch(w2);
 		else if(!strcmpi(w1, "start_limited_time"))
@@ -2165,8 +1547,6 @@ int login_config_read(const char* cfgName)
 			safestrncpy(login_config.date_format, w2, sizeof(login_config.date_format));
 		else if(!strcmpi(w1, "console"))
 			login_config.console = (bool)config_switch(w2);
-//		else if(!strcmpi(w1, "case_sensitive"))
-//			login_config.case_sensitive = config_switch(w2);
 		else if(!strcmpi(w1, "allowed_regs")) //account flood protection system
 			allowed_regs = atoi(w2);
 		else if(!strcmpi(w1, "time_allowed"))
@@ -2179,77 +1559,87 @@ int login_config_read(const char* cfgName)
 			safestrncpy(login_config.dnsbl_servs, w2, sizeof(login_config.dnsbl_servs));
 		else if(!strcmpi(w1, "ip_sync_interval"))
 			login_config.ip_sync_interval = (unsigned int)1000*60*atoi(w2); //w2 comes in minutes.
+
+		else if(!strcmpi(w1, "admin_state"))
+			login_config.admin_state = (bool)config_switch(w2);
+		else if(!strcmpi(w1, "admin_pass"))
+			safestrncpy(login_config.admin_pass, w2, sizeof(login_config.admin_pass));
+		else if(!strcmpi(w1, "admin_allowed_host"))
+			safestrncpy(login_config.admin_allowed_host, w2, sizeof(login_config.admin_pass));
+
 		else if(!strcmpi(w1, "import"))
 			login_config_read(w2);
+		else
+		if( ipban_config_read(w1, w2) )
+			continue;
+		else if(!strcmpi(w1, "account.engine"))
+			safestrncpy(login_config.account_engine, w2, sizeof(login_config.account_engine));
+		else
+		{// try the account engines
+			int i;
+			for( i = 0; account_engines[i].constructor; ++i )
+			{
+				AccountDB* db = account_engines[i].db;
+				if( db && db->set_property(db, w1, w2) )
+					break;
+			}
+		}
 	}
 	fclose(fp);
 	ShowInfo("Finished reading %s.\n", cfgName);
 	return 0;
 }
 
-//-------------------------------------
-// Displaying of configuration warnings
-//-------------------------------------
-void display_conf_warnings(void)
+//-----------------------------------
+// Reading interserver configuration file
+//-----------------------------------
+void inter_config_read(const char* cfgName)
 {
-	if( admin_state ) {
-		if (admin_pass[0] == '\0') {
-			ShowWarning("Administrator password is void (admin_pass).\n");
-		} else if (strcmp(admin_pass, "admin") == 0) {
-			ShowWarning("You are using the default administrator password (admin_pass).\n");
-			ShowWarning("  We highly recommend that you change it.\n");
-		}
-	}
-
-	if (gm_account_filename_check_timer < 0) {
-		ShowWarning("Invalid value for gm_account_filename_check_timer parameter. Setting to 15 sec (default).\n");
-		gm_account_filename_check_timer = 15;
-	} else if (gm_account_filename_check_timer == 1) {
-		ShowWarning("Invalid value for gm_account_filename_check_timer parameter. Setting to 2 sec (minimum value).\n");
-		gm_account_filename_check_timer = 2;
+	char line[1024], w1[1024], w2[1024];
+	FILE* fp = fopen(cfgName, "r");
+	if(fp == NULL) {
+		ShowError("file not found: %s\n", cfgName);
+		return;
 	}
+	ShowInfo("reading configuration file %s...\n", cfgName);
+	while(fgets(line, sizeof(line), fp))
+	{
+		if (line[0] == '/' && line[1] == '/')
+			continue;
+		if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) < 2)
+			continue;
 
-	if (login_config.min_level_to_connect < 0) { // 0: all players, 1-99 at least gm level x
-		ShowWarning("Invalid value for min_level_to_connect (%d) parameter -> setting 0 (any player).\n", login_config.min_level_to_connect);
-		login_config.min_level_to_connect = 0;
-	} else if (login_config.min_level_to_connect > 99) { // 0: all players, 1-99 at least gm level x
-		ShowWarning("Invalid value for min_level_to_connect (%d) parameter -> setting to 99 (only GM level 99)\n", login_config.min_level_to_connect);
-		login_config.min_level_to_connect = 99;
-	}
+		// settings common for multiple components
+		ipban_config_read(w1,w2);
+		loginlog_config_read(w1,w2);
 
-	if (login_config.start_limited_time < -1) { // -1: create unlimited account, 0 or more: additionnal sec from now to create limited time
-		ShowWarning("Invalid value for start_limited_time parameter\n");
-		ShowWarning("  -> setting to -1 (new accounts are created with unlimited time).\n");
-		login_config.start_limited_time = -1;
+		if (!strcmpi(w1, "import"))
+			inter_config_read(w2);
 	}
-
-	return;
+	fclose(fp);
+	ShowInfo("Done reading %s.\n", cfgName);
 }
 
-void login_set_defaults()
+/// Get the engine selected in the config settings.
+/// Updates the config setting with the selected engine if 'auto'.
+static AccountDB* get_account_engine(void)
 {
-	login_config.login_ip = INADDR_ANY;
-	login_config.login_port = 6900;
-	login_config.ip_sync_interval = 0;
-	login_config.log_login = true;
-	safestrncpy(login_config.date_format, "%Y-%m-%d %H:%M:%S", sizeof(login_config.date_format));
-	login_config.console = false;
-	login_config.new_account_flag = true;
-//	login_config.case_sensitive = true;
-	login_config.use_md5_passwds = false;
-//	login_config.login_gm_read = true;
-	login_config.min_level_to_connect = 0;
-	login_config.online_check = true;
-	login_config.check_client_version = false;
-	login_config.client_version_to_connect = 20;
+	int i;
+	bool get_first = (strcmp(login_config.account_engine,"auto") == 0);
 
-//	login_config.ipban = true;
-//	login_config.dynamic_pass_failure_ban = true;
-//	login_config.dynamic_pass_failure_ban_interval = 5;
-//	login_config.dynamic_pass_failure_ban_limit = 7;
-//	login_config.dynamic_pass_failure_ban_duration = 5;
-	login_config.use_dnsbl = false;
-	safestrncpy(login_config.dnsbl_servs, "", sizeof(login_config.dnsbl_servs));
+	for( i = 0; account_engines[i].constructor; ++i )
+	{
+		char name[sizeof(login_config.account_engine)];
+		AccountDB* db = account_engines[i].db;
+		if( db && db->get_property(db, "engine.name", name, sizeof(name)) &&
+			(get_first || strcmp(name, login_config.account_engine) == 0) )
+		{
+			if( get_first )
+				safestrncpy(login_config.account_engine, name, sizeof(login_config.account_engine));
+			return db;
+		}
+	}
+	return NULL;
 }
 
 //--------------------------------------
@@ -2258,15 +1648,28 @@ void login_set_defaults()
 void do_final(void)
 {
 	int i, fd;
+
+	login_log(0, "login server", 100, "login server shutdown");
 	ShowStatus("Terminating...\n");
 
-	mmo_auth_sync();
+	if( login_config.log_login )
+		loginlog_final();
+
+	ipban_final();
+
+	for( i = 0; account_engines[i].constructor; ++i )
+	{// destroy all account engines
+		AccountDB* db = account_engines[i].db;
+		if( db )
+		{
+			db->destroy(db);
+			account_engines[i].db = NULL;
+		}
+	}
+	accounts = NULL; // destroyed in account_engines
 	online_db->destroy(online_db, NULL);
 	auth_db->destroy(auth_db, NULL);
 
-	if(auth_dat) aFree(auth_dat);
-	if(gm_account_db) aFree(gm_account_db);
-
 	for (i = 0; i < MAX_SERVERS; i++) {
 		if ((fd = server[i].fd) >= 0) {
 			memset(&server[i], 0, sizeof(struct mmo_char_server));
@@ -2299,20 +1702,27 @@ int do_init(int argc, char** argv)
 {
 	int i;
 
-	login_set_defaults();
+	// intialize engines (to accept config settings)
+	for( i = 0; account_engines[i].constructor; ++i )
+		account_engines[i].db = account_engines[i].constructor();
 
 	// read login-server configuration
+	login_set_defaults();
 	login_config_read((argc > 1) ? argv[1] : LOGIN_CONF_NAME);
-	display_conf_warnings(); // not in login_config_read, because we can use 'import' option, and display same message twice or more
 	login_lan_config_read((argc > 2) ? argv[2] : LAN_CONF_NAME);
+	inter_config_read(INTER_CONF_NAME);
 
 	srand((unsigned int)time(NULL));
 
 	for( i = 0; i < MAX_SERVERS; i++ )
 		server[i].fd = -1;
 
-	// Accounts database init
-	mmo_auth_init();
+	// initialize logging
+	if( login_config.log_login )
+		loginlog_init();
+
+	// initialize static and dynamic ipban system
+	ipban_init();
 
 	// Online user database init
 	online_db = idb_alloc(DB_OPT_RELEASE_DATA);
@@ -2321,21 +1731,9 @@ int do_init(int argc, char** argv)
 	// Interserver auth init
 	auth_db = idb_alloc(DB_OPT_RELEASE_DATA);
 
-	// Read account information.
-	read_gm_account();
-
 	// set default parser as parse_login function
 	set_defaultparse(parse_login);
 
-	add_timer_func_list(check_auth_sync, "check_auth_sync");
-	add_timer_interval(gettick() + 60000, check_auth_sync, 0, 0, 60000); // every 60 sec we check if we must save accounts file (only if necessary to save)
-
-	// every x sec we check if gm file has been changed
-	if( gm_account_filename_check_timer ) {
-		add_timer_func_list(check_GM_file, "check_GM_file");
-		add_timer_interval(gettick() + gm_account_filename_check_timer * 1000, check_GM_file, 0, 0, gm_account_filename_check_timer * 1000); 
-	}
-
 	// every 10 minutes cleanup online account db.
 	add_timer_func_list(online_data_cleanup, "online_data_cleanup");
 	add_timer_interval(gettick() + 600*1000, online_data_cleanup, 0, 0, 600*1000);
@@ -2346,17 +1744,30 @@ int do_init(int argc, char** argv)
 		add_timer_interval(gettick() + login_config.ip_sync_interval, sync_ip_addresses, 0, 0, login_config.ip_sync_interval);
 	}
 
+	// Account database init
+	accounts = get_account_engine();
+	if( accounts == NULL )
+	{
+		ShowError("do_init: account engine '%s' not found.\n", login_config.account_engine);
+		runflag = 0;
+		return 1;
+	}
+	else
+	{
+		ShowInfo("Using account engine '%s'.\n", login_config.account_engine);
+		accounts->init(accounts);
+	}
+
 	if( login_config.console )
 	{
 		//##TODO invoke a CONSOLE_START plugin event
 	}
 
-	new_reg_tick = gettick();
-
 	// server port open & binding
 	login_fd = make_listen_bind(login_config.login_ip, login_config.login_port);
 
 	ShowStatus("The login-server is "CL_GREEN"ready"CL_RESET" (Server is listening on the port %u).\n\n", login_config.login_port);
+	login_log(0, "login server", 100, "login server started");
 
 	return 0;
 }
diff --git a/src/login/login.h b/src/login/login.h
index 1147d6bb6..8ffa06eec 100644
--- a/src/login/login.h
+++ b/src/login/login.h
@@ -7,6 +7,7 @@
 #include "../common/mmo.h" // NAME_LENGTH
 
 #define LOGIN_CONF_NAME "conf/login_athena.conf"
+#define INTER_CONF_NAME "conf/inter_athena.conf"
 #define LAN_CONF_NAME "conf/subnet_athena.conf"
 
 // supported encryption types: 1- passwordencrypt, 2- passwordencrypt2, 3- both
@@ -38,9 +39,9 @@ struct mmo_char_server {
 	int fd;
 	uint32 ip;
 	uint16 port;
-	uint16 users;		// user count on this server
-	uint16 maintenance;	// in maintenance mode?
-	uint16 new_;		// allows creating new chars?
+	uint16 users;       // user count on this server
+	uint16 maintenance; // in maintenance mode?
+	uint16 new_;        // should display as 'new'?
 };
 
 struct Login_Config {
@@ -53,42 +54,28 @@ struct Login_Config {
 	bool console;                                   // console input system enabled?
 	bool new_account_flag;                          // autoregistration via _M/_F ?
 	int start_limited_time;                         // new account expiration time (-1: unlimited)
-//	bool case_sensitive;                            // are logins case sensitive ?
 	bool use_md5_passwds;                           // work with password hashes instead of plaintext passwords?
-//	bool login_gm_read;                             // should the login server handle info about gm accounts?
 	int min_level_to_connect;                       // minimum level of player/GM (0: player, 1-99: GM) to connect
 	bool online_check;                              // reject incoming players that are already registered as online ?
 	bool check_client_version;                      // check the clientversion set in the clientinfo ?
 	int client_version_to_connect;                  // the client version needed to connect (if checking is enabled)
 
-//	bool ipban;                                     // perform IP blocking (via contents of `ipbanlist`) ?
-//	bool dynamic_pass_failure_ban;                  // automatic IP blocking due to failed login attemps ?
-//	unsigned int dynamic_pass_failure_ban_interval; // how far to scan the loginlog for password failures
-//	unsigned int dynamic_pass_failure_ban_limit;    // number of failures needed to trigger the ipban
-//	unsigned int dynamic_pass_failure_ban_duration; // duration of the ipban
+	bool admin_state;                               // is ladmin support enabled?
+	char admin_pass[24];                            // security password for ladmin
+	char admin_allowed_host[32];                    // host/ip that is allowed to connect as ladmin
+
+	bool ipban;                                     // perform IP blocking (via contents of `ipbanlist`) ?
+	bool dynamic_pass_failure_ban;                  // automatic IP blocking due to failed login attemps ?
+	unsigned int dynamic_pass_failure_ban_interval; // how far to scan the loginlog for password failures
+	unsigned int dynamic_pass_failure_ban_limit;    // number of failures needed to trigger the ipban
+	unsigned int dynamic_pass_failure_ban_duration; // duration of the ipban
 	bool use_dnsbl;                                 // dns blacklist blocking ?
 	char dnsbl_servs[1024];                         // comma-separated list of dnsbl servers
 
+	char account_engine[256];                       // name of the engine to use (defaults to auto, for the first available engine)
 };
 
-struct mmo_account {
-
-	int account_id;
-	char sex;
-	char userid[24];
-	char pass[32+1]; // 23+1 for normal, 32+1 for md5-ed passwords
-	char lastlogin[24];
-	int logincount;
-	uint32 state; // packet 0x006a value + 1 (0: compte OK)
-	char email[40]; // e-mail (by default: a@a.com)
-	char error_message[20]; // Message of error code #6 = Your are Prohibited to log in until %s (packet 0x006a)
-	time_t unban_time; // # of seconds 1/1/1970 (timestamp): ban time limit of the account (0 = no ban)
-	time_t expiration_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited)
-	char last_ip[16]; // save of last IP of connection
-	char memo[255]; // a memo field
-	int account_reg2_num;
-	struct global_reg account_reg2[ACCOUNT_REG2_NUM]; // account script variables (stored on login server)
-};
+extern struct Login_Config login_config;
 
 
 #endif /* _LOGIN_H_ */
diff --git a/src/login/loginlog.h b/src/login/loginlog.h
new file mode 100644
index 000000000..749d0fbf1
--- /dev/null
+++ b/src/login/loginlog.h
@@ -0,0 +1,14 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#ifndef __LOGINLOG_H_INCLUDED__
+#define __LOGINLOG_H_INCLUDED__
+
+
+void login_log(uint32 ip, const char* username, int rcode, const char* message);
+bool loginlog_init(void);
+bool loginlog_final(void);
+bool loginlog_config_read(const char* w1, const char* w2);
+
+
+#endif // __LOGINLOG_H_INCLUDED__
diff --git a/src/login/loginlog_sql.c b/src/login/loginlog_sql.c
new file mode 100644
index 000000000..96bff6957
--- /dev/null
+++ b/src/login/loginlog_sql.c
@@ -0,0 +1,93 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#include "../common/cbasetypes.h"
+#include "../common/mmo.h"
+#include "../common/socket.h"
+#include "../common/sql.h"
+#include "../common/strlib.h"
+#include <string.h>
+#include <stdlib.h> // exit
+
+char   log_db_ip[32] = "127.0.0.1";
+uint16 log_db_port = 3306;
+char   log_db_id[32] = "ragnarok";
+char   log_db_pw[32] = "ragnarok";
+char   log_db_db[32] = "ragnarok";
+char   log_db[32] = "log";
+
+char loginlog_db[256] = "loginlog";
+Sql* sql_handle;
+bool enabled = false;
+
+
+/*=============================================
+ * Records an event in the login log
+ *---------------------------------------------*/
+void login_log(uint32 ip, const char* username, int rcode, const char* message)
+{
+	char esc_username[NAME_LENGTH*2+1];
+	char esc_message[255*2+1];
+	int retcode;
+
+	if( !enabled )
+		return;
+
+	Sql_EscapeStringLen(sql_handle, esc_username, username, strnlen(username, NAME_LENGTH));
+	Sql_EscapeStringLen(sql_handle, esc_message, message, strnlen(message, 255));
+
+	retcode = Sql_Query(sql_handle,
+		"INSERT INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '%s', '%s', '%d', '%s')",
+		loginlog_db, ip2str(ip,NULL), esc_username, rcode, message);
+
+	if( retcode != SQL_SUCCESS )
+		Sql_ShowDebug(sql_handle);
+}
+
+bool loginlog_init(void)
+{
+	sql_handle = Sql_Malloc();
+
+	if( SQL_ERROR == Sql_Connect(sql_handle, log_db_id, log_db_pw, log_db_ip, log_db_port, log_db_db) )
+	{
+		Sql_ShowDebug(sql_handle);
+		Sql_Free(sql_handle);
+		exit(EXIT_FAILURE);
+	}
+
+	enabled = true;
+
+	return true;
+}
+
+bool loginlog_final(void)
+{
+	Sql_Free(sql_handle);
+	sql_handle = NULL;
+	return true;
+}
+
+bool loginlog_config_read(const char* key, const char* value)
+{
+	if( strcmpi(key, "log_db_ip") == 0 )
+		safestrncpy(log_db_ip, value, sizeof(log_db_ip));
+	else
+	if( strcmpi(key, "log_db_port") == 0 )
+		log_db_port = (uint16)strtoul(value, NULL, 10);
+	else
+	if( strcmpi(key, "log_db_id") == 0 )
+		safestrncpy(log_db_id, value, sizeof(log_db_id));
+	else
+	if( strcmpi(key, "log_db_pw") == 0 )
+		safestrncpy(log_db_pw, value, sizeof(log_db_pw));
+	else
+	if( strcmpi(key, "log_db") == 0 )
+		safestrncpy(log_db, value, sizeof(log_db));
+	else
+	if( strcmpi(key, "loginlog_db") == 0 )
+		safestrncpy(loginlog_db, value, sizeof(loginlog_db));
+	else
+		return false;
+
+	return true;
+}
diff --git a/src/login/loginlog_txt.c b/src/login/loginlog_txt.c
new file mode 100644
index 000000000..d40142110
--- /dev/null
+++ b/src/login/loginlog_txt.c
@@ -0,0 +1,74 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#include "../common/cbasetypes.h"
+#include "../common/mmo.h"
+#include "../common/core.h"
+#include "../common/malloc.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/showmsg.h"
+#include "account.h"
+#include "login.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+char login_log_filename[1024] = "log/login.log";
+
+
+
+/*=============================================
+ * Records an event in the login log
+ *---------------------------------------------*/
+void login_log(uint32 ip, const char* username, int rcode, const char* message)
+{
+	FILE* log_fp;
+
+	if( !login_config.log_login )
+		return;
+	
+	log_fp = fopen(login_log_filename, "a");
+	if( log_fp != NULL )
+	{
+		char esc_username[NAME_LENGTH*4+1];
+		char esc_message[255*4+1];
+		time_t raw_time;
+		char str_time[24];
+
+		sv_escape_c(esc_username, username, NAME_LENGTH, NULL);
+		sv_escape_c(esc_message, message, 255, NULL);
+
+		time(&raw_time);
+		strftime(str_time, 24, login_config.date_format, localtime(&raw_time));
+		str_time[23] = '\0';
+
+		fprintf(log_fp, "%s\t%s\t%s\t%d\t%s\n", str_time, ip2str(ip,NULL), esc_username, rcode, esc_message);
+
+		fclose(log_fp);
+	}
+}
+
+
+bool loginlog_config_read(const char* w1, const char* w2)
+{
+	if(!strcmpi(w1, "login_log_filename"))
+		safestrncpy(login_log_filename, w2, sizeof(login_log_filename));
+	else
+		return false;
+
+	return true;
+}
+
+
+bool loginlog_init(void)
+{
+	return true;
+}
+
+
+bool loginlog_final(void)
+{
+	return true;
+}
diff --git a/src/login_sql/Makefile.in b/src/login_sql/Makefile.in
deleted file mode 100644
index 05bd9262e..000000000
--- a/src/login_sql/Makefile.in
+++ /dev/null
@@ -1,60 +0,0 @@
-
-COMMON_OBJ = ../common/obj_all/core.o ../common/obj_all/socket.o ../common/obj_all/timer.o \
-	../common/obj_all/db.o ../common/obj_all/plugins.o ../common/obj_all/lock.o \
-	../common/obj_all/malloc.o ../common/obj_all/showmsg.o ../common/obj_all/utils.o \
-	../common/obj_all/strlib.o ../common/obj_all/grfio.o ../common/obj_all/mapindex.o \
-	../common/obj_all/ers.o ../common/obj_all/md5calc.o ../common/obj_sql/sql.o 
-COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h \
-	../common/version.h ../common/db.h ../common/plugins.h ../common/lock.h \
-	../common/malloc.h ../common/showmsg.h ../common/utils.h ../common/strlib.h \
-	../common/grfio.h ../common/mapindex.h \
-	../common/ers.h ../common/md5calc.h ../common/sql.h 
-
-LOGIN_OBJ = obj_sql/login.o
-LOGIN_H = login.h
-
-HAVE_MYSQL=@HAVE_MYSQL@
-ifeq ($(HAVE_MYSQL),yes)
-	LOGIN_SERVER_SQL_DEPENDS=obj_sql $(LOGIN_OBJ) $(COMMON_OBJ)
-else
-	LOGIN_SERVER_SQL_DEPENDS=needs_mysql
-endif
-
-@SET_MAKE@
-
-#####################################################################
-.PHONY : all login-server_sql clean help
-
-all: login-server_sql
-
-login-server_sql: $(LOGIN_SERVER_SQL_DEPENDS)
-	@CC@ @LDFLAGS@ -o ../../login-server_sql@EXEEXT@ $(LOGIN_OBJ) $(COMMON_OBJ) @LIBS@ @MYSQL_LIBS@
-
-clean:
-	rm -rf *.o obj_sql ../../login-server_sql@EXEEXT@
-
-help:
-	@echo "possible targets are 'login-server_sql' 'all' 'clean' 'help'"
-	@echo "'login-server_sql'  - login server (SQL version)"
-	@echo "'all'               - builds all above targets"
-	@echo "'clean'             - cleans builds and objects"
-	@echo "'help'              - outputs this message"
-
-#####################################################################
-
-needs_mysql:
-	@echo "MySQL not found or disabled by the configure script"
-	@exit 1
-
-obj_sql:
-	-mkdir obj_sql
-
-obj_sql/%.o: %.c $(LOGIN_H) $(COMMON_H)
-	@CC@ @CFLAGS@ $(CUSTOM_CFLAGS) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
-
-# missing common object files
-../common/obj_all/%.o:
-	@$(MAKE) -C ../common sql
-
-../common/obj_sql/%.o:
-	@$(MAKE) -C ../common sql
diff --git a/src/login_sql/login.c b/src/login_sql/login.c
deleted file mode 100644
index cd53f7d4e..000000000
--- a/src/login_sql/login.c
+++ /dev/null
@@ -1,1982 +0,0 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
-
-#include "../common/cbasetypes.h"
-#include "../common/mmo.h"
-#include "../common/core.h"
-#include "../common/socket.h"
-#include "../common/db.h"
-#include "../common/timer.h"
-#include "../common/malloc.h"
-#include "../common/strlib.h"
-#include "../common/showmsg.h"
-#include "../common/version.h"
-#include "../common/md5calc.h"
-#include "../common/sql.h"
-#include "login.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h> // for stat/lstat/fstat
-
-struct Login_Config login_config;
-
-int login_fd; // login server socket
-#define MAX_SERVERS 30
-struct mmo_char_server server[MAX_SERVERS]; // char server data
-
-#define sex_num2str(num) ( (num ==  0  ) ? 'F' : (num ==  1  ) ? 'M' : 'S' )
-#define sex_str2num(str) ( (str == 'F' ) ?  0  : (str == 'M' ) ?  1  :  2  )
-
-// Advanced subnet check [LuzZza]
-struct s_subnet {
-	uint32 mask;
-	uint32 char_ip;
-	uint32 map_ip;
-} subnet[16];
-
-int subnet_count = 0;
-
-// GM account management
-struct gm_account* gm_account_db = NULL;
-unsigned int GM_num = 0; // number of gm accounts
-
-//Account registration flood protection [Kevin]
-int allowed_regs = 1;
-int time_allowed = 10; //in seconds
-unsigned int new_reg_tick = 0;
-
-
-// data handling (SQL)
-Sql* sql_handle;
-
-// database parameters
-uint16 login_server_port = 3306;
-char login_server_ip[32] = "127.0.0.1";
-char login_server_id[32] = "ragnarok";
-char login_server_pw[32] = "ragnarok";
-char login_server_db[32] = "ragnarok";
-char default_codepage[32] = "";
-
-char login_db[256] = "login";
-char loginlog_db[256] = "loginlog";
-char reg_db[256] = "global_reg_value";
-
-// added to help out custom login tables, without having to recompile
-// source so options are kept in the login_athena.conf or the inter_athena.conf
-char login_db_account_id[256] = "account_id";
-char login_db_userid[256] = "userid";
-char login_db_user_pass[256] = "user_pass";
-char login_db_level[256] = "level";
-
-
-//-----------------------------------------------------
-// Auth database
-//-----------------------------------------------------
-#define AUTH_TIMEOUT 30000
-
-struct auth_node {
-	int account_id;
-	uint32 login_id1;
-	uint32 login_id2;
-	uint32 ip;
-	char sex;
-};
-
-static DBMap* auth_db; // int account_id -> struct auth_node*
-
-//-----------------------------------------------------
-// Online User Database [Wizputer]
-//-----------------------------------------------------
-
-struct online_login_data {
-	int account_id;
-	int waiting_disconnect;
-	int char_server;
-};
-
-static DBMap* online_db; // int account_id -> struct online_login_data*
-static int waiting_disconnect_timer(int tid, unsigned int tick, int id, intptr data);
-
-static void* create_online_user(DBKey key, va_list args)
-{
-	struct online_login_data* p;
-	CREATE(p, struct online_login_data, 1);
-	p->account_id = key.i;
-	p->char_server = -1;
-	p->waiting_disconnect = -1;
-	return p;
-}
-
-struct online_login_data* add_online_user(int char_server, int account_id)
-{
-	struct online_login_data* p;
-	if( !login_config.online_check )
-		return NULL;
-	p = (struct online_login_data*)idb_ensure(online_db, account_id, create_online_user);
-	p->char_server = char_server;
-	if( p->waiting_disconnect != -1 )
-	{
-		delete_timer(p->waiting_disconnect, waiting_disconnect_timer);
-		p->waiting_disconnect = -1;
-	}
-	return p;
-}
-
-void remove_online_user(int account_id)
-{
-	struct online_login_data* p;
-	if( !login_config.online_check )
-		return;
-	p = (struct online_login_data*)idb_get(online_db, account_id);
-	if( p == NULL )
-		return;
-	if( p->waiting_disconnect != -1 )
-		delete_timer(p->waiting_disconnect, waiting_disconnect_timer);
-
-	idb_remove(online_db, account_id);
-}
-
-static int waiting_disconnect_timer(int tid, unsigned int tick, int id, intptr data)
-{
-	struct online_login_data* p = (struct online_login_data*)idb_get(online_db, id);
-	if( p != NULL && p->waiting_disconnect == tid && p->account_id == id )
-	{
-		p->waiting_disconnect = -1;
-		remove_online_user(id);
-		idb_remove(auth_db, id);
-	}
-	return 0;
-}
-
-//--------------------------------------------------------------------
-// Packet send to all char-servers, except one (wos: without our self)
-//--------------------------------------------------------------------
-int charif_sendallwos(int sfd, uint8* buf, size_t len)
-{
-	int i, c;
-
-	for( i = 0, c = 0; i < MAX_SERVERS; ++i )
-	{
-		int fd = server[i].fd;
-		if( session_isValid(fd) && fd != sfd )
-		{
-			WFIFOHEAD(fd,len);
-			memcpy(WFIFOP(fd,0), buf, len);
-			WFIFOSET(fd,len);
-			++c;
-		}
-	}
-
-	return c;
-}
-
-//-----------------------------------------------------
-// Read GM accounts
-//-----------------------------------------------------
-void read_gm_account(void)
-{
-	if( !login_config.login_gm_read )
-		return;// char server's job
-
-	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `%s`,`%s` FROM `%s` WHERE `%s` > '0'", login_db_account_id, login_db_level, login_db, login_db_level) )
-	{
-		Sql_ShowDebug(sql_handle);
-		return;// Failed to read GM list!
-	}
-
-	RECREATE(gm_account_db, struct gm_account, (size_t)Sql_NumRows(sql_handle));
-
-	for( GM_num = 0; SQL_SUCCESS == Sql_NextRow(sql_handle); ++GM_num )
-	{
-		char* account;
-		char* level;
-
-		Sql_GetData(sql_handle, 0, &account, NULL);
-		Sql_GetData(sql_handle, 1, &level, NULL);
-
-		gm_account_db[GM_num].account_id = atoi(account);
-		gm_account_db[GM_num].level = atoi(level);
-	}
-
-	Sql_FreeResult(sql_handle);
-}
-
-//-----------------------------------------------------
-// Send GM accounts to one or all char-servers
-//-----------------------------------------------------
-void send_GM_accounts(int fd)
-{
-	unsigned int i;
-	uint8 buf[32767];
-	uint16 len;
-
-	if( !login_config.login_gm_read )
-		return;
-
-	len = 4;
-	WBUFW(buf,0) = 0x2732;
-	for( i = 0; i < GM_num; ++i )
-	{
-		// send only existing accounts. We can not create a GM account when server is online.
-		if( gm_account_db[i].level > 0 )
-		{
-			WBUFL(buf,len) = gm_account_db[i].account_id;
-			WBUFB(buf,len+4) = (uint8)gm_account_db[i].level;
-			len += 5;
-			if( len >= 32000 )
-			{
-				ShowWarning("send_GM_accounts: Too many accounts! Only %d out of %d were sent.\n", i, GM_num);
-				break;
-			}
-		}
-	}
-
-	WBUFW(buf,2) = len;
-	if( fd == -1 )// send to all charservers
-		charif_sendallwos(-1, buf, len);
-	else
-	{// send only to target
-		WFIFOHEAD(fd,len);
-		memcpy(WFIFOP(fd,0), buf, len);
-		WFIFOSET(fd,len);
-	}
-
-	return;
-}
-
-/*=============================================
- * Does a mysql_ping to all connection handles
- *---------------------------------------------*/
-int login_sql_ping(int tid, unsigned int tick, int id, intptr data) 
-{
-	ShowInfo("Pinging SQL server to keep connection alive...\n");
-	Sql_Ping(sql_handle);
-	return 0;
-}
-
-int sql_ping_init(void)
-{
-	uint32 connection_timeout, connection_ping_interval;
-
-	// set a default value first
-	connection_timeout = 28800; // 8 hours
-
-	// ask the mysql server for the timeout value
-	if( SQL_SUCCESS == Sql_GetTimeout(sql_handle, &connection_timeout) && connection_timeout < 60 )
-		connection_timeout = 60;
-
-	// establish keepalive
-	connection_ping_interval = connection_timeout - 30; // 30-second reserve
-	add_timer_func_list(login_sql_ping, "login_sql_ping");
-	add_timer_interval(gettick() + connection_ping_interval*1000, login_sql_ping, 0, 0, connection_ping_interval*1000);
-
-	return 0;
-}
-
-//-----------------------------------------------------
-// Read Account database - mysql db
-//-----------------------------------------------------
-int mmo_auth_sqldb_init(void)
-{
-	ShowStatus("Login server init....\n");
-
-	sql_handle = Sql_Malloc();
-
-	// DB connection start
-	ShowStatus("Connect Login Database Server....\n");
-	if( SQL_ERROR == Sql_Connect(sql_handle, login_server_id, login_server_pw, login_server_ip, login_server_port, login_server_db) )
-	{
-		Sql_ShowDebug(sql_handle);
-		Sql_Free(sql_handle);
-		exit(EXIT_FAILURE);
-	}
-	else
-	{
-		ShowStatus("Connect success!\n");
-	}
-
-	if( default_codepage[0] != '\0' && SQL_ERROR == Sql_SetEncoding(sql_handle, default_codepage) )
-		Sql_ShowDebug(sql_handle);
-
-	if( login_config.log_login && SQL_ERROR == Sql_Query(sql_handle, "INSERT DELAYED INTO `%s` (`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '0', 'lserver','100','login server started')", loginlog_db) )
-		Sql_ShowDebug(sql_handle);
-
-	sql_ping_init();
-
-	return 0;
-}
-
-
-//-----------------------------------------------------
-// close DB
-//-----------------------------------------------------
-void mmo_db_close(void)
-{
-	int i, fd;
-
-	//set log.
-	if( login_config.log_login && SQL_ERROR == Sql_Query(sql_handle, "INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '0', 'lserver','100', 'login server shutdown')", loginlog_db) )
-		Sql_ShowDebug(sql_handle);
-
-	for( i = 0; i < MAX_SERVERS; ++i )
-	{
-		fd = server[i].fd;
-		if( session_isValid(fd) )
-		{// Clean only data related to servers we are connected to. [Skotlex]
-			if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `sstatus` WHERE `index` = '%d'", i) )
-				Sql_ShowDebug(sql_handle);
-			do_close(fd);
-		}
-	}
-	Sql_Free(sql_handle);
-	sql_handle = NULL;
-	ShowStatus("close DB connect....\n");
-	if( login_fd > 0 )
-		do_close(login_fd);
-}
-
-//-----------------------------------------------------
-// periodic ip address synchronization
-//-----------------------------------------------------
-static int sync_ip_addresses(int tid, unsigned int tick, int id, intptr data)
-{
-	uint8 buf[2];
-	ShowInfo("IP Sync in progress...\n");
-	WBUFW(buf,0) = 0x2735;
-	charif_sendallwos(-1, buf, 2);
-	return 0;
-}
-
-//-----------------------------------------------------
-// encrypted/unencrypted password check
-//-----------------------------------------------------
-bool check_encrypted(const char* str1, const char* str2, const char* passwd)
-{
-	char md5str[64], md5bin[32];
-
-	snprintf(md5str, sizeof(md5str), "%s%s", str1, str2);
-	md5str[sizeof(md5str)-1] = '\0';
-	MD5_String2binary(md5str, md5bin);
-
-	return (0==memcmp(passwd, md5bin, 16));
-}
-
-bool check_password(struct login_session_data* ld, int passwdenc, const char* passwd, const char* refpass)
-{	
-	if(passwdenc == 0)
-	{
-		return (0==strcmp(passwd, refpass));
-	}
-	else if (ld)
-	{
-		// password mode set to 1 -> (md5key, refpass) enable with <passwordencrypt></passwordencrypt>
-		// password mode set to 2 -> (refpass, md5key) enable with <passwordencrypt2></passwordencrypt2>
-		
-		return ((passwdenc&0x01) && check_encrypted(ld->md5key, refpass, passwd)) ||
-		       ((passwdenc&0x02) && check_encrypted(refpass, ld->md5key, passwd));
-	}
-	return false;
-}
-
-
-//-----------------------------------------------------
-// Make new account
-//-----------------------------------------------------
-int mmo_auth_new(struct mmo_account* account)
-{
-	static int num_regs = 0; // registration counter
-	unsigned int tick = gettick();
-
-	char md5buf[32+1];
-	time_t expiration_time = 0;
-	SqlStmt* stmt;
-	int result = 0;
-
-	//Account Registration Flood Protection by [Kevin]
-	if( DIFF_TICK(tick, new_reg_tick) < 0 && num_regs >= allowed_regs )
-	{
-		ShowNotice("Account registration denied (registration limit exceeded)\n");
-		return 3;
-	}
-
-	// check if the account doesn't exist already
-	stmt = SqlStmt_Malloc(sql_handle);
-	if( SQL_SUCCESS != SqlStmt_Prepare(stmt, "SELECT `%s` FROM `%s` WHERE `userid` = ?", login_db_userid, login_db)
-	||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 0, SQLDT_STRING, account->userid, strnlen(account->userid, NAME_LENGTH))
-	||  SQL_SUCCESS != SqlStmt_Execute(stmt) )
-	{
-		SqlStmt_ShowDebug(stmt);
-		result = 1;// error
-	}
-	else if( SqlStmt_NumRows(stmt) > 0 )
-		result = 1;// username already taken
-	SqlStmt_Free(stmt);
-	if( result )
-		return result;// error or incorrect user
-
-	if( login_config.start_limited_time != -1 )
-		expiration_time = time(NULL) + login_config.start_limited_time;
-
-	// insert new entry into db
-	//TODO: error checking
-	stmt = SqlStmt_Malloc(sql_handle);
-	SqlStmt_Prepare(stmt, "INSERT INTO `%s` (`%s`, `%s`, `sex`, `email`, `connect_until`) VALUES (?, ?, '%c', 'a@a.com', '%d')", login_db, login_db_userid, login_db_user_pass, account->sex, expiration_time);
-	SqlStmt_BindParam(stmt, 0, SQLDT_STRING, account->userid, strnlen(account->userid, NAME_LENGTH));
-	if( login_config.use_md5_passwds )
-	{
-		MD5_String(account->pass, md5buf);
-		SqlStmt_BindParam(stmt, 1, SQLDT_STRING, md5buf, 32);
-	}
-	else
-		SqlStmt_BindParam(stmt, 1, SQLDT_STRING, account->pass, strnlen(account->pass, NAME_LENGTH));
-	SqlStmt_Execute(stmt);
-
-	ShowNotice("Account creation (account %s, id: %d, pass: %s, sex: %c)\n", account->userid, (int)SqlStmt_LastInsertId(stmt), account->pass, account->sex);
-	SqlStmt_Free(stmt);
-
-	if( DIFF_TICK(tick, new_reg_tick) > 0 )
-	{// Update the registration check.
-		num_regs = 0;
-		new_reg_tick = tick + time_allowed*1000;
-	}
-	++num_regs;
-
-	return 0;
-}
-
-
-//-----------------------------------------------------
-// Check/authentication of a connection
-//-----------------------------------------------------
-int mmo_auth(struct login_session_data* sd)
-{
-	time_t unban_time;
-	char esc_userid[NAME_LENGTH*2+1];// escaped username
-	char user_password[256], password[256];
-	long expiration_time;
-	int state;
-	size_t len;
-	char* data;
-
-	char ip[16];
-	ip2str(session[sd->fd]->client_addr, ip);
-
-	// DNS Blacklist check
-	if( login_config.use_dnsbl )
-	{
-		char r_ip[16];
-		char ip_dnsbl[256];
-		char* dnsbl_serv;
-		bool matched = false;
-		uint8* sin_addr = (uint8*)&session[sd->fd]->client_addr;
-
-		sprintf(r_ip, "%u.%u.%u.%u", sin_addr[0], sin_addr[1], sin_addr[2], sin_addr[3]);
-
-		for( dnsbl_serv = strtok(login_config.dnsbl_servs,","); !matched && dnsbl_serv != NULL; dnsbl_serv = strtok(NULL,",") )
-		{
-			sprintf(ip_dnsbl, "%s.%s", r_ip, dnsbl_serv);
-			if( host2ip(ip_dnsbl) )
-				matched = true;
-		}
-
-		if( matched )
-		{
-			ShowInfo("DNSBL: (%s) Blacklisted. User Kicked.\n", r_ip);
-			return 3;
-		}
-	}
-
-	//Client Version check
-	if( login_config.check_client_version && sd->version != login_config.client_version_to_connect )
-		return 5;
-
-	len = strnlen(sd->userid, NAME_LENGTH);
-
-	// Account creation with _M/_F
-	if( login_config.new_account_flag )
-	{
-		if( len > 2 && strnlen(sd->passwd, NAME_LENGTH) > 0 && // valid user and password lengths
-			sd->passwdenc == 0 && // unencoded password
-			sd->userid[len-2] == '_' && memchr("FfMm", sd->userid[len-1], 4) ) // _M/_F suffix
-		{
-			struct mmo_account acc;
-			int result;
-
-			len -= 2;
-			sd->userid[len] = '\0';
-
-			memset(&acc, '\0', sizeof(acc));
-			safestrncpy(acc.userid, sd->userid, NAME_LENGTH);
-			safestrncpy(acc.pass, sd->passwd, NAME_LENGTH);
-			safestrncpy(acc.email, "a@a.com", sizeof(acc.email));
-			acc.sex = TOUPPER(sd->userid[len+1]);
-
-			result = mmo_auth_new(&acc);
-			if( result )
-				return result;// Failed to make account. [Skotlex].
-		}
-	}
-
-	// escape username
-	Sql_EscapeStringLen(sql_handle, esc_userid, sd->userid, len);
-
-	// retrieve login entry for the specified username
-	if( SQL_ERROR == Sql_Query(sql_handle,
-		"SELECT `%s`,`%s`,`lastlogin`,`sex`,`connect_until`,`ban_until`,`state`,`%s` FROM `%s` WHERE `%s`= %s '%s'",
-		login_db_account_id, login_db_user_pass, login_db_level,
-		login_db, login_db_userid, (login_config.case_sensitive ? "BINARY" : ""), esc_userid) )
-		Sql_ShowDebug(sql_handle);
-
-	if( Sql_NumRows(sql_handle) == 0 ) // no such entry
-	{
-		ShowNotice("auth failed: no such account '%s'\n", esc_userid);
-		Sql_FreeResult(sql_handle);
-		return 0;
-	}
-
-	Sql_NextRow(sql_handle); //TODO: error checking?
-
-	Sql_GetData(sql_handle, 0, &data, NULL); sd->account_id = atoi(data);
-	Sql_GetData(sql_handle, 1, &data, &len); safestrncpy(password, data, sizeof(password));
-	Sql_GetData(sql_handle, 2, &data, NULL); safestrncpy(sd->lastlogin, data, sizeof(sd->lastlogin));
-	Sql_GetData(sql_handle, 3, &data, NULL); sd->sex = *data;
-	Sql_GetData(sql_handle, 4, &data, NULL); expiration_time = atol(data);
-	Sql_GetData(sql_handle, 5, &data, NULL); unban_time = atol(data);
-	Sql_GetData(sql_handle, 6, &data, NULL); state = atoi(data);
-	Sql_GetData(sql_handle, 7, &data, NULL); sd->level = atoi(data);
-	if( len > sizeof(password) - 1 )
-		ShowDebug("mmo_auth: password buffer is too small (len=%u,buflen=%u)\n", len, sizeof(password));
-	if( sd->level > 99 )
-		sd->level = 99;
-
-	Sql_FreeResult(sql_handle);
-
-	if( login_config.use_md5_passwds )
-		MD5_String(sd->passwd, user_password);
-	else
-		safestrncpy(user_password, sd->passwd, NAME_LENGTH);
-
-	if( !check_password(sd, sd->passwdenc, user_password, password) )
-	{
-		ShowInfo("Invalid password (account: '%s', pass: '%s', received pass: '%s', ip: %s)\n",
-			esc_userid, password, (sd->passwdenc) ? "[MD5]" : user_password, ip);
-		return 1; // 1 = Incorrect Password
-	}
-
-	if( expiration_time != 0 && expiration_time < time(NULL) )
-		return 2; // 2 = This ID is expired
-
-	if( unban_time != 0 && unban_time > time(NULL) )
-		return 6; // 6 = Your are Prohibited to log in until %s
-
-	if( state )
-	{
-		ShowInfo("Connection refused (account: %s, pass: %s, state: %d, ip: %s)\n", sd->userid, sd->passwd, state, ip);
-		return state - 1;
-	}
-
-	sd->login_id1 = rand();
-	sd->login_id2 = rand();
-
-	if( sd->sex != 'S' && sd->account_id < START_ACCOUNT_NUM )
-		ShowWarning("Account %s has account id %d! Account IDs must be over %d to work properly!\n", sd->userid, sd->account_id, START_ACCOUNT_NUM);
-
-	if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `lastlogin` = NOW(), `logincount`=`logincount`+1, `last_ip`='%s', `ban_until`='0', `state`='0' WHERE `%s` = '%d'",
-		login_db, ip, login_db_account_id, sd->account_id) )
-		Sql_ShowDebug(sql_handle);
-
-	return -1; // account OK
-}
-
-static int online_db_setoffline(DBKey key, void* data, va_list ap)
-{
-	struct online_login_data* p = (struct online_login_data*)data;
-	int server = va_arg(ap, int);
-	if( server == -1 )
-	{
-		p->char_server = -1;
-		if( p->waiting_disconnect != -1 )
-		{
-			delete_timer(p->waiting_disconnect, waiting_disconnect_timer);
-			p->waiting_disconnect = -1;
-		}
-	}
-	else if( p->char_server == server )
-		p->char_server = -2; //Char server disconnected.
-	return 0;
-}
-
-//--------------------------------
-// Packet parsing for char-servers
-//--------------------------------
-int parse_fromchar(int fd)
-{
-	unsigned int i;
-	int id;
-	uint32 ipl;
-	char ip[16];
-
-	ARR_FIND( 0, MAX_SERVERS, id, server[id].fd == fd );
-	if( id == MAX_SERVERS )
-	{// not a char server
-		set_eof(fd);
-		do_close(fd);
-		return 0;
-	}
-
-	if( session[fd]->flag.eof )
-	{
-		ShowStatus("Char-server '%s' has disconnected.\n", server[id].name);
-		online_db->foreach(online_db, online_db_setoffline, id); //Set all chars from this char server to offline.
-		if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `sstatus` WHERE `index`='%d'", id) )
-			Sql_ShowDebug(sql_handle);
-		memset(&server[id], 0, sizeof(struct mmo_char_server));
-		server[id].fd = -1;
-		do_close(fd);
-		return 0;
-	}
-
-	ipl = server[id].ip;
-	ip2str(ipl, ip);
-
-	while( RFIFOREST(fd) >= 2 )
-	{
-		uint16 command = RFIFOW(fd,0);
-
-		switch( command )
-		{
-
-		case 0x2709: // request from map-server via char-server to reload GM accounts
-			RFIFOSKIP(fd,2);
-			ShowStatus("Char-server '%s': Request to re-load GM configuration file (ip: %s).\n", server[id].name, ip);
-			if( login_config.log_login )
-			{
-				if( SQL_ERROR == Sql_Query(sql_handle, "INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`log`) VALUES (NOW(), '%u', '%s', 'GM reload request')", loginlog_db, ipl, server[id].name) )
-					Sql_ShowDebug(sql_handle);
-			}
-			read_gm_account();
-			// send GM accounts to all char-servers
-			send_GM_accounts(-1);
-		break;
-
-		case 0x2712: // request from char-server to authenticate an account
-			if( RFIFOREST(fd) < 19 )
-				return 0;
-		{
-			struct auth_node* node;
-
-			int account_id = RFIFOL(fd,2);
-			uint32 login_id1 = RFIFOL(fd,6);
-			uint32 login_id2 = RFIFOL(fd,10);
-			char sex = sex_num2str(RFIFOB(fd,14));
-			uint32 ip_ = ntohl(RFIFOL(fd,15));
-			RFIFOSKIP(fd,19);
-
-			node = (struct auth_node*)idb_get(auth_db, account_id);
-			if( node != NULL &&
-			    node->account_id == account_id &&
-				node->login_id1  == login_id1 &&
-				node->login_id2  == login_id2 &&
-				node->sex        == sex &&
-				node->ip         == ip_ )
-			{// found
-				uint32 expiration_time;
-				char email[40];
-
-				// each auth entry can only be used once
-				idb_remove(auth_db, account_id);
-
-				// retrieve email and account expiration time
-				if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `email`,`connect_until` FROM `%s` WHERE `%s`='%d'", login_db, login_db_account_id, account_id) )
-					Sql_ShowDebug(sql_handle);
-				if( SQL_SUCCESS == Sql_NextRow(sql_handle) )
-				{
-					char* data = NULL;
-					size_t len = 0;
-
-					Sql_GetData(sql_handle, 0, &data, &len); safestrncpy(email, data, sizeof(email));
-					Sql_GetData(sql_handle, 1, &data, NULL); expiration_time = (uint32)strtoul(data, NULL, 10);
-					if( len > sizeof(email) )
-						ShowDebug("parse_fromchar:0x2712: email is too long (len=%u,maxlen=%u)\n", len, sizeof(email));
-
-					Sql_FreeResult(sql_handle);
-				}
-				else
-				{
-					memset(email, 0, sizeof(email));
-					expiration_time = 0;
-				}
-
-				// send ack
-				WFIFOHEAD(fd,59);
-				WFIFOW(fd,0) = 0x2713;
-				WFIFOL(fd,2) = account_id;
-				WFIFOL(fd,6) = login_id1;
-				WFIFOL(fd,10) = login_id2;
-				WFIFOB(fd,14) = 0;
-				memcpy(WFIFOP(fd,15), email, 40);
-				WFIFOL(fd,55) = expiration_time;
-				WFIFOSET(fd,59);
-			}
-			else
-			{// authentication not found
-				ShowStatus("Char-server '%s': authentication of the account %d REFUSED (ip: %s).\n", server[id].name, account_id, ip);
-				WFIFOHEAD(fd,59);
-				WFIFOW(fd,0) = 0x2713;
-				WFIFOL(fd,2) = account_id;
-				WFIFOL(fd,6) = login_id1;
-				WFIFOL(fd,10) = login_id2;
-				WFIFOB(fd,14) = 1;
-				// It is unnecessary to send email
-				// It is unnecessary to send validity date of the account
-				WFIFOSET(fd,59);
-			}
-		}
-		break;
-
-		case 0x2714:
-			if( RFIFOREST(fd) < 6 )
-				return 0;
-		{
-			int users = RFIFOL(fd,2);
-			RFIFOSKIP(fd,6);
-
-			// how many users on world? (update)
-			if( server[id].users != users )
-			{
-				ShowStatus("set users %s : %d\n", server[id].name, users);
-
-				server[id].users = users;
-				if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `sstatus` SET `user` = '%d' WHERE `index` = '%d'", server[id].users, id) )
-					Sql_ShowDebug(sql_handle);
-			}
-		}
-		break;
-
-		case 0x2716: // received an e-mail/limited time request, because a player comes back from a map-server to the char-server
-			if( RFIFOREST(fd) < 6 )
-				return 0;
-		{
-			uint32 expiration_time = 0;
-			char email[40] = "";
-
-			int account_id = RFIFOL(fd,2);
-			RFIFOSKIP(fd,6);
-
-			if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `email`,`connect_until` FROM `%s` WHERE `%s`='%d'", login_db, login_db_account_id, account_id) )
-				Sql_ShowDebug(sql_handle);
-			else if( SQL_SUCCESS == Sql_NextRow(sql_handle) )
-			{
-				char* data;
-				size_t len;
-
-				Sql_GetData(sql_handle, 0, &data, &len);
-				safestrncpy(email, data, sizeof(email));
-
-				Sql_GetData(sql_handle, 1, &data, NULL);
-				expiration_time = (uint32)strtoul(data, NULL, 10);
-
-				Sql_FreeResult(sql_handle);
-			}
-
-			WFIFOHEAD(fd,50);
-			WFIFOW(fd,0) = 0x2717;
-			WFIFOL(fd,2) = account_id;
-			safestrncpy((char*)WFIFOP(fd,6), email, 40);
-			WFIFOL(fd,46) = expiration_time;
-			WFIFOSET(fd,50);
-		}
-		break;
-
-		case 0x2719: // ping request from charserver
-			if( RFIFOREST(fd) < 2 )
-				return 0;
-			RFIFOSKIP(fd,2);
-
-			WFIFOHEAD(fd,2);
-			WFIFOW(fd,0) = 0x2718;
-			WFIFOSET(fd,2);
-		break;
-
-		// Map server send information to change an email of an account via char-server
-		case 0x2722:	// 0x2722 <account_id>.L <actual_e-mail>.40B <new_e-mail>.40B
-			if (RFIFOREST(fd) < 86)
-				return 0;
-		{
-			char actual_email[40];
-			char new_email[40];
-			int account_id = RFIFOL(fd,2);
-			safestrncpy(actual_email, (char*)RFIFOP(fd,6), 40);
-			safestrncpy(new_email, (char*)RFIFOP(fd,46), 40);
-			RFIFOSKIP(fd, 86);
-
-			if( e_mail_check(actual_email) == 0 )
-				ShowNotice("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command), but actual email is invalid (account: %d, ip: %s)\n", server[id].name, account_id, ip);
-			else if( e_mail_check(new_email) == 0 )
-				ShowNotice("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command) with a invalid new e-mail (account: %d, ip: %s)\n", server[id].name, account_id, ip);
-			else if( strcmpi(new_email, "a@a.com") == 0 )
-				ShowNotice("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command) with a default e-mail (account: %d, ip: %s)\n", server[id].name, account_id, ip);
-			else if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `%s`,`email` FROM `%s` WHERE `%s` = '%d'", login_db_userid, login_db, login_db_account_id, account_id) )
-				Sql_ShowDebug(sql_handle);
-			else if( SQL_SUCCESS == Sql_NextRow(sql_handle) )
-			{
-				char* data;
-				size_t len;
-
-				Sql_GetData(sql_handle, 1, &data, &len);
-				if( strncasecmp(data, actual_email, sizeof(actual_email)) == 0 )
-				{
-					char esc_user_id[NAME_LENGTH*2+1];
-					char esc_new_email[sizeof(new_email)*2+1];
-
-					Sql_GetData(sql_handle, 0, &data, &len);
-					Sql_EscapeStringLen(sql_handle, esc_user_id, data, len);
-					Sql_EscapeStringLen(sql_handle, esc_new_email, new_email, strnlen(new_email, sizeof(new_email)));
-
-					if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `email` = '%s' WHERE `%s` = '%d'", login_db, esc_new_email, login_db_account_id, account_id) )
-						Sql_ShowDebug(sql_handle);
-					ShowInfo("Char-server '%s': Modify an e-mail on an account (@email GM command) (account: %d ('%s'), new e-mail: '%s', ip: %s).\n", server[id].name, account_id, esc_user_id, esc_new_email, ip);
-				}
-				Sql_FreeResult(sql_handle);
-			}
-		}
-		break;
-
-		case 0x2724: // Receiving an account state update request from a map-server (relayed via char-server)
-			if (RFIFOREST(fd) < 10)
-				return 0;
-		{
-			int account_id = RFIFOL(fd,2);
-			int state = RFIFOL(fd,6);
-			RFIFOSKIP(fd,10);
-
-			if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `state` FROM `%s` WHERE `%s` = '%d'", login_db, login_db_account_id, account_id) )
-				Sql_ShowDebug(sql_handle);
-			else if( SQL_SUCCESS == Sql_NextRow(sql_handle) )
-			{
-				char* data;
-
-				Sql_GetData(sql_handle, 0, &data, NULL);
-				if( atoi(data) != state && state != 0 )
-				{
-					uint8 buf[11];
-					WBUFW(buf,0) = 0x2731;
-					WBUFL(buf,2) = account_id;
-					WBUFB(buf,6) = 0; // 0: change of state, 1: ban
-					WBUFL(buf,7) = state; // status or final date of a banishment
-					charif_sendallwos(-1, buf, 11);
-				}
-				Sql_FreeResult(sql_handle);
-			}
-
-			if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `state` = '%d' WHERE `%s` = '%d'", login_db, state, login_db_account_id, account_id) )
-				Sql_ShowDebug(sql_handle);
-		}
-		break;
-
-		case 0x2725: // Receiving of map-server via char-server a ban request
-			if (RFIFOREST(fd) < 18)
-				return 0;
-		{
-			struct tm *tmtime;
-			time_t tmptime = 0;
-			time_t timestamp = time(NULL);
-
-			int account_id = RFIFOL(fd,2);
-			int year = (short)RFIFOW(fd,6);
-			int month = (short)RFIFOW(fd,8);
-			int mday = (short)RFIFOW(fd,10);
-			int hour = (short)RFIFOW(fd,12);
-			int min = (short)RFIFOW(fd,14);
-			int sec = (short)RFIFOW(fd,16);
-			RFIFOSKIP(fd,18);
-
-			if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `ban_until` FROM `%s` WHERE `%s` = '%d'", login_db, login_db_account_id, account_id) )
-				Sql_ShowDebug(sql_handle);
-			else if( SQL_SUCCESS == Sql_NextRow(sql_handle) )
-			{
-				char* data;
-
-				Sql_GetData(sql_handle, 0, &data, NULL);
-				tmptime = (time_t)strtoul(data, NULL, 10);
-				if( tmptime > time(NULL) )
-					timestamp = tmptime;
-			}
-			tmtime = localtime(&timestamp);
-			tmtime->tm_year = tmtime->tm_year + year;
-			tmtime->tm_mon  = tmtime->tm_mon  + month;
-			tmtime->tm_mday = tmtime->tm_mday + mday;
-			tmtime->tm_hour = tmtime->tm_hour + hour;
-			tmtime->tm_min  = tmtime->tm_min  + min;
-			tmtime->tm_sec  = tmtime->tm_sec  + sec;
-			timestamp = mktime(tmtime);
-			if( timestamp != (time_t)-1 )
-			{
-				if( timestamp <= time(NULL) )
-					timestamp = 0;
-				if( tmptime != timestamp )
-				{
-					if( timestamp != 0 )
-					{
-						uint8 buf[11];
-						WBUFW(buf,0) = 0x2731;
-						WBUFL(buf,2) = account_id;
-						WBUFB(buf,6) = 1; // 0: change of statut, 1: ban
-						WBUFL(buf,7) = (uint32)timestamp; // status or final date of a banishment
-						charif_sendallwos(-1, buf, 11);
-					}
-					ShowNotice("Account: %d Banned until: %lu\n", account_id, (unsigned long)timestamp);
-					if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `ban_until` = '%lu' WHERE `%s` = '%d'", login_db, (unsigned long)timestamp, login_db_account_id, account_id) )
-						Sql_ShowDebug(sql_handle);
-				}
-			}
-		}
-		break;
-
-		case 0x2727: // Change of sex (sex is reversed)
-			if( RFIFOREST(fd) < 6 )
-				return 0;
-		{
-			int account_id = RFIFOL(fd,2);
-			RFIFOSKIP(fd,6);
-
-			if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `sex` FROM `%s` WHERE `%s` = '%d'", login_db, login_db_account_id, account_id) )
-				Sql_ShowDebug(sql_handle);
-			else if( SQL_SUCCESS == Sql_NextRow(sql_handle) )
-			{
-				unsigned char buf[7];
-				int sex;
-				char* data;
-
-				Sql_GetData(sql_handle, 0, &data, NULL);
-				sex = ( *data == 'M' ) ? 'F' : 'M'; //Change gender
-
-				if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `sex` = '%c' WHERE `%s` = '%d'", login_db, sex, login_db_account_id, account_id) )
-					Sql_ShowDebug(sql_handle);
-
-				WBUFW(buf,0) = 0x2723;
-				WBUFL(buf,2) = account_id;
-				WBUFB(buf,6) = sex_str2num(sex);
-				charif_sendallwos(-1, buf, 7);
-			}
-		}
-		break;
-
-		case 0x2728:	// save account_reg2
-			if( RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2) )
-				return 0;
-			if( RFIFOL(fd,4) > 0 )
-			{
-				SqlStmt* stmt;
-				int account_id;
-				size_t off;
-
-				account_id = RFIFOL(fd,4);
-
-				//Delete all global account variables....
-				if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `type`='1' AND `account_id`='%d';", reg_db, account_id) )
-					Sql_ShowDebug(sql_handle);
-
-				//Proceed to insert them....
-				stmt = SqlStmt_Malloc(sql_handle);
-				if( SQL_ERROR == SqlStmt_Prepare(stmt, "INSERT INTO `%s` (`type`, `account_id`, `str`, `value`) VALUES ( 1 , '%d' , ? , ?);",  reg_db, account_id) )
-					SqlStmt_ShowDebug(stmt);
-				for( i = 0, off = 13; i < ACCOUNT_REG2_NUM && off < RFIFOW(fd,2); ++i )
-				{
-					char* p;
-					size_t len;
-
-					// str
-					p = (char*)RFIFOP(fd,off);
-					len = strlen(p);
-					SqlStmt_BindParam(stmt, 0, SQLDT_STRING, p, len);
-					off += len + 1;
-
-					// value
-					p = (char*)RFIFOP(fd,off);
-					len = strlen(p);
-					SqlStmt_BindParam(stmt, 1, SQLDT_STRING, p, len);
-					off += len + 1;
-
-					if( SQL_ERROR == SqlStmt_Execute(stmt) )
-						SqlStmt_ShowDebug(stmt);
-				}
-				SqlStmt_Free(stmt);
-
-				// Sending information towards the other char-servers.
-				RFIFOW(fd,0) = 0x2729;// reusing read buffer
-				charif_sendallwos(fd, RFIFOP(fd,0), RFIFOW(fd,2));
-				RFIFOSKIP(fd,RFIFOW(fd,2));
-			}
-		break;
-
-		case 0x272a:	// Receiving of map-server via char-server an unban request
-			if( RFIFOREST(fd) < 6 )
-				return 0;
-		{
-			int account_id = RFIFOL(fd,2);
-			RFIFOSKIP(fd,6);
-
-			if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `ban_until` FROM `%s` WHERE `%s` = '%d'", login_db, login_db_account_id, account_id) )
-				Sql_ShowDebug(sql_handle);
-			else if( Sql_NumRows(sql_handle) > 0 )
-			{// Found a match
-				if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `ban_until` = '0' WHERE `%s` = '%d'", login_db, login_db_account_id, account_id) )
-					Sql_ShowDebug(sql_handle);
-			}
-		}
-		break;
-
-		case 0x272b:    // Set account_id to online [Wizputer]
-			if( RFIFOREST(fd) < 6 )
-				return 0;
-			add_online_user(id, RFIFOL(fd,2));
-			RFIFOSKIP(fd,6);
-		break;
-
-		case 0x272c:   // Set account_id to offline [Wizputer]
-			if( RFIFOREST(fd) < 6 )
-				return 0;
-			remove_online_user(RFIFOL(fd,2));
-			RFIFOSKIP(fd,6);
-		break;
-
-		case 0x272d:	// Receive list of all online accounts. [Skotlex]
-			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
-				return 0;
-			if( login_config.online_check )
-			{
-				struct online_login_data *p;
-				int aid;
-				uint32 i, users;
-				online_db->foreach(online_db, online_db_setoffline, id); //Set all chars from this char-server offline first
-				users = RFIFOW(fd,4);
-				for (i = 0; i < users; i++) {
-					aid = RFIFOL(fd,6+i*4);
-					p = (struct online_login_data*)idb_ensure(online_db, aid, create_online_user);
-					p->char_server = id;
-					if (p->waiting_disconnect != -1)
-					{
-						delete_timer(p->waiting_disconnect, waiting_disconnect_timer);
-						p->waiting_disconnect = -1;
-					}
-				}
-			}
-			RFIFOSKIP(fd,RFIFOW(fd,2));
-		break;
-
-		case 0x272e: //Request account_reg2 for a character.
-			if (RFIFOREST(fd) < 10)
-				return 0;
-		{
-			size_t off;
-
-			int account_id = RFIFOL(fd,2);
-			int char_id = RFIFOL(fd,6);
-			RFIFOSKIP(fd,10);
-
-			WFIFOHEAD(fd,10000);
-			WFIFOW(fd,0) = 0x2729;
-			WFIFOL(fd,4) = account_id;
-			WFIFOL(fd,8) = char_id;
-			WFIFOB(fd,12) = 1; //Type 1 for Account2 registry
-
-			if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `str`,`value` FROM `%s` WHERE `type`='1' AND `account_id`='%d'", reg_db, account_id) )
-				Sql_ShowDebug(sql_handle);
-
-			off = 13;
-			while( SQL_SUCCESS == Sql_NextRow(sql_handle) && off < 9000 )
-			{
-				char* data;
-				
-				// str
-				Sql_GetData(sql_handle, 0, &data, NULL);
-				if( *data != '\0' )
-				{
-					off += sprintf((char*)WFIFOP(fd,off), "%s", data)+1; //We add 1 to consider the '\0' in place.
-					
-					// value
-					Sql_GetData(sql_handle, 1, &data, NULL);
-					off += sprintf((char*)WFIFOP(fd,off), "%s", data)+1;
-				}
-			}
-			Sql_FreeResult(sql_handle);
-
-			if( off >= 9000 )
-				ShowWarning("Too many account2 registries for AID %d. Some registries were not sent.\n", account_id);
-
-			WFIFOW(fd,2) = (uint16)off;
-			WFIFOSET(fd,WFIFOW(fd,2));
-		}
-		break;
-
-		case 0x2736: // WAN IP update from char-server
-			if( RFIFOREST(fd) < 6 )
-				return 0;
-			server[id].ip = ntohl(RFIFOL(fd,2));
-			ShowInfo("Updated IP of Server #%d to %d.%d.%d.%d.\n",id, CONVIP(server[id].ip));
-			RFIFOSKIP(fd,6);
-		break;
-
-		case 0x2737: //Request to set all offline.
-			ShowInfo("Setting accounts from char-server %d offline.\n", id);
-			online_db->foreach(online_db, online_db_setoffline, id);
-			RFIFOSKIP(fd,2);
-		break;
-
-		default:
-			ShowError("parse_fromchar: Unknown packet 0x%x from a char-server! Disconnecting!\n", command);
-			set_eof(fd);
-			return 0;
-		} // switch
-	} // while
-
-	RFIFOSKIP(fd,RFIFOREST(fd));
-	return 0;
-}
-
-//--------------------------------------------
-// Test to know if an IP come from LAN or WAN.
-//--------------------------------------------
-int lan_subnetcheck(uint32 ip)
-{
-	int i;
-	ARR_FIND( 0, subnet_count, i, (subnet[i].char_ip & subnet[i].mask) == (ip & subnet[i].mask) );
-	return ( i < subnet_count ) ? subnet[i].char_ip : 0;
-}
-
-int login_ip_ban_check(uint32 ip)
-{
-	uint8* p = (uint8*)&ip;
-	char* data = NULL;
-	int matches;
-
-	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT count(*) FROM `ipbanlist` WHERE `list` = '%u.*.*.*' OR `list` = '%u.%u.*.*' OR `list` = '%u.%u.%u.*' OR `list` = '%u.%u.%u.%u'",
-		p[3], p[3], p[2], p[3], p[2], p[1], p[3], p[2], p[1], p[0]) )
-	{
-		Sql_ShowDebug(sql_handle);
-		// close connection because we can't verify their connectivity.
-		return 1;
-	}
-
-	if( SQL_ERROR == Sql_NextRow(sql_handle) )
-		return 1;// Shouldn't happen, but just in case...
-
-	Sql_GetData(sql_handle, 0, &data, NULL);
-	matches = atoi(data);
-	Sql_FreeResult(sql_handle);
-
-	if( matches == 0 )
-		return 0;// No ban
-
-	// ip ban ok.
-	ShowInfo("Packet from banned ip : %u.%u.%u.%u\n", CONVIP(ip));
-
-	if( login_config.log_login && SQL_ERROR == Sql_Query(sql_handle, "INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '%u', 'unknown','-3', 'ip banned')", loginlog_db, ip) )
-		Sql_ShowDebug(sql_handle);
-	return 1;
-}
-
-void login_auth_ok(struct login_session_data* sd)
-{
-	int fd = sd->fd;
-	uint32 ip = session[fd]->client_addr;
-
-	char esc_userid[NAME_LENGTH*2+1];
-	uint8 server_num, n;
-	uint32 subnet_char_ip;
-	struct auth_node* node;
-	int i;
-
-	Sql_EscapeStringLen(sql_handle, esc_userid, sd->userid, strlen(sd->userid));
-
-	if( sd->level < login_config.min_level_to_connect )
-	{
-		ShowStatus("Connection refused: the minimum GM level for connection is %d (account: %s, GM level: %d).\n", login_config.min_level_to_connect, sd->userid, sd->level);
-		WFIFOHEAD(fd,3);
-		WFIFOW(fd,0) = 0x81;
-		WFIFOB(fd,2) = 1; // 01 = Server closed
-		WFIFOSET(fd,3);
-		return;
-	}
-
-	server_num = 0;
-	for( i = 0; i < MAX_SERVERS; ++i )
-		if( session_isValid(server[i].fd) )
-			server_num++;
-
-	if( server_num == 0 )
-	{// if no char-server, don't send void list of servers, just disconnect the player with proper message
-		ShowStatus("Connection refused: there is no char-server online (account: %s).\n", sd->userid);
-		WFIFOHEAD(fd,3);
-		WFIFOW(fd,0) = 0x81;
-		WFIFOB(fd,2) = 1; // 01 = Server closed
-		WFIFOSET(fd,3);
-		return;
-	}
-
-	if( login_config.online_check )
-	{
-		struct online_login_data* data = (struct online_login_data*)idb_get(online_db, sd->account_id);
-		if( data )
-		{// account is already marked as online!
-			if( data->char_server > -1 )
-			{// Request char servers to kick this account out. [Skotlex]
-				uint8 buf[6];
-				ShowNotice("User '%s' is already online - Rejected.\n", sd->userid);
-				WBUFW(buf,0) = 0x2734;
-				WBUFL(buf,2) = sd->account_id;
-				charif_sendallwos(-1, buf, 6);
-				if( data->waiting_disconnect == -1 )
-					data->waiting_disconnect = add_timer(gettick()+AUTH_TIMEOUT, waiting_disconnect_timer, sd->account_id, 0);
-
-				WFIFOHEAD(fd,3);
-				WFIFOW(fd,0) = 0x81;
-				WFIFOB(fd,2) = 8; // 08 = Server still recognizes your last login
-				WFIFOSET(fd,3);
-				return;
-			}
-			else
-			if( data->char_server == -1 )
-			{// client has authed but did not access char-server yet
-				// wipe previous session
-				idb_remove(auth_db, sd->account_id);
-				remove_online_user(sd->account_id);
-				data = NULL;
-			}
-		}
-	}
-
-	if( login_config.log_login && SQL_ERROR == Sql_Query(sql_handle, "INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '%u', '%s','100', 'login ok')", loginlog_db, ip, esc_userid) )
-		Sql_ShowDebug(sql_handle);
-
-	if( sd->level > 0 )
-		ShowStatus("Connection of the GM (level:%d) account '%s' accepted.\n", sd->level, sd->userid);
-	else
-		ShowStatus("Connection of the account '%s' accepted.\n", sd->userid);
-
-	WFIFOHEAD(fd,47+32*server_num);
-	WFIFOW(fd,0) = 0x69;
-	WFIFOW(fd,2) = 47+32*server_num;
-	WFIFOL(fd,4) = sd->login_id1;
-	WFIFOL(fd,8) = sd->account_id;
-	WFIFOL(fd,12) = sd->login_id2;
-	WFIFOL(fd,16) = 0; // in old version, that was for ip (not more used)
-	//memcpy(WFIFOP(fd,20), sd->lastlogin, 24); // in old version, that was for name (not more used)
-	WFIFOW(fd,44) = 0; // unknown
-	WFIFOB(fd,46) = sex_str2num(sd->sex);
-	for( i = 0, n = 0; i < MAX_SERVERS; ++i )
-	{
-		if( !session_isValid(server[i].fd) )
-			continue;
-
-		subnet_char_ip = lan_subnetcheck(ip); // Advanced subnet check [LuzZza]
-		WFIFOL(fd,47+n*32) = htonl((subnet_char_ip) ? subnet_char_ip : server[i].ip);
-		WFIFOW(fd,47+n*32+4) = ntows(htons(server[i].port)); // [!] LE byte order here [!]
-		memcpy(WFIFOP(fd,47+n*32+6), server[i].name, 20);
-		WFIFOW(fd,47+n*32+26) = server[i].users;
-		WFIFOW(fd,47+n*32+28) = server[i].maintenance;
-		WFIFOW(fd,47+n*32+30) = server[i].new_;
-		n++;
-	}
-	WFIFOSET(fd,47+32*server_num);
-
-	// create temporary auth entry
-	CREATE(node, struct auth_node, 1);
-	node->account_id = sd->account_id;
-	node->login_id1 = sd->login_id1;
-	node->login_id2 = sd->login_id2;
-	node->sex = sd->sex;
-	node->ip = ip;
-	idb_put(auth_db, sd->account_id, node);
-
-	if( login_config.online_check )
-	{
-		struct online_login_data* data;
-
-		// mark client as 'online'
-		data = add_online_user(-1, sd->account_id);
-
-		// schedule deletion of this node
-		data->waiting_disconnect = add_timer(gettick()+AUTH_TIMEOUT, waiting_disconnect_timer, sd->account_id, 0);
-	}
-}
-
-void login_auth_failed(struct login_session_data* sd, int result)
-{
-	int fd = sd->fd;
-	uint32 ip = session[fd]->client_addr;
-	char esc_userid[NAME_LENGTH*2+1];
-
-	Sql_EscapeStringLen(sql_handle, esc_userid, sd->userid, strlen(sd->userid));
-
-	if (login_config.log_login)
-	{
-		const char* error;
-		switch( result ) {
-		case   0: error = "Unregistered ID."; break; // 0 = Unregistered ID
-		case   1: error = "Incorrect Password."; break; // 1 = Incorrect Password
-		case   2: error = "Account Expired."; break; // 2 = This ID is expired
-		case   3: error = "Rejected from server."; break; // 3 = Rejected from Server
-		case   4: error = "Blocked by GM."; break; // 4 = You have been blocked by the GM Team
-		case   5: error = "Not latest game EXE."; break; // 5 = Your Game's EXE file is not the latest version
-		case   6: error = "Banned."; break; // 6 = Your are Prohibited to log in until %s
-		case   7: error = "Server Over-population."; break; // 7 = Server is jammed due to over populated
-		case   8: error = "Account limit from company"; break; // 8 = No more accounts may be connected from this company
-		case   9: error = "Ban by DBA"; break; // 9 = MSI_REFUSE_BAN_BY_DBA
-		case  10: error = "Email not confirmed"; break; // 10 = MSI_REFUSE_EMAIL_NOT_CONFIRMED
-		case  11: error = "Ban by GM"; break; // 11 = MSI_REFUSE_BAN_BY_GM
-		case  12: error = "Working in DB"; break; // 12 = MSI_REFUSE_TEMP_BAN_FOR_DBWORK
-		case  13: error = "Self Lock"; break; // 13 = MSI_REFUSE_SELF_LOCK
-		case  14: error = "Not Permitted Group"; break; // 14 = MSI_REFUSE_NOT_PERMITTED_GROUP
-		case  15: error = "Not Permitted Group"; break; // 15 = MSI_REFUSE_NOT_PERMITTED_GROUP
-		case  99: error = "Account gone."; break; // 99 = This ID has been totally erased
-		case 100: error = "Login info remains."; break; // 100 = Login information remains at %s
-		case 101: error = "Hacking investigation."; break; // 101 = Account has been locked for a hacking investigation. Please contact the GM Team for more information
-		case 102: error = "Bug investigation."; break; // 102 = This account has been temporarily prohibited from login due to a bug-related investigation
-		case 103: error = "Deleting char."; break; // 103 = This character is being deleted. Login is temporarily unavailable for the time being
-		case 104: error = "Deleting spouse char."; break; // 104 = This character is being deleted. Login is temporarily unavailable for the time being
-		default : error = "Unknown Error."; break;
-		}
-
-		if( SQL_ERROR == Sql_Query(sql_handle, "INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '%u', '%s', '%d','login failed : %s')", loginlog_db, ip, esc_userid, result, error) )
-			Sql_ShowDebug(sql_handle);
-	}
-
-	if( result == 1 && login_config.dynamic_pass_failure_ban && login_config.log_login ) // failed password
-	{
-		unsigned long failures = 0;
-		if( SQL_ERROR == Sql_Query(sql_handle, "SELECT count(*) FROM `%s` WHERE `ip` = '%u' AND `rcode` = '1' AND `time` > NOW() - INTERVAL %d MINUTE",
-			loginlog_db, ip, login_config.dynamic_pass_failure_ban_interval) )// how many times failed account? in one ip.
-			Sql_ShowDebug(sql_handle);
-
-		//check query result
-		if( SQL_SUCCESS == Sql_NextRow(sql_handle) )
-		{
-			char* data;
-			Sql_GetData(sql_handle, 0, &data, NULL);
-			failures = strtoul(data, NULL, 10);
-			Sql_FreeResult(sql_handle);
-		}
-		if( failures >= login_config.dynamic_pass_failure_ban_limit )
-		{
-			uint8* p = (uint8*)&ip;
-			if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `ipbanlist`(`list`,`btime`,`rtime`,`reason`) VALUES ('%u.%u.%u.*', NOW() , NOW() +  INTERVAL %d MINUTE ,'Password error ban: %s')", p[3], p[2], p[1], login_config.dynamic_pass_failure_ban_duration, esc_userid) )
-				Sql_ShowDebug(sql_handle);
-		}
-	}
-
-	WFIFOHEAD(fd,23);
-	WFIFOW(fd,0) = 0x6a;
-	WFIFOB(fd,2) = (uint8)result;
-	if( result != 6 )
-		memset(WFIFOP(fd,3), '\0', 20);
-	else
-	{// 6 = Your are Prohibited to log in until %s
-		if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `ban_until` FROM `%s` WHERE `%s` = %s '%s'", login_db, login_db_userid, (login_config.case_sensitive ? "BINARY" : ""), esc_userid) )
-			Sql_ShowDebug(sql_handle);
-		else if( SQL_SUCCESS == Sql_NextRow(sql_handle) )
-		{
-			char* data;
-			time_t unban_time;
-
-			Sql_GetData(sql_handle, 0, &data, NULL);
-			unban_time = (time_t)strtoul(data, NULL, 10);
-			Sql_FreeResult(sql_handle);
-
-			strftime((char*)WFIFOP(fd,3), 20, login_config.date_format, localtime(&unban_time));
-		}
-	}
-	WFIFOSET(fd,23);
-}
-
-//----------------------------------------------------------------------------------------
-// Default packet parsing (normal players or administation/char-server connection requests)
-//----------------------------------------------------------------------------------------
-int parse_login(int fd)
-{
-	struct login_session_data* sd = session[fd]->session_data;
-	int result;
-	uint32 ipl;
-	char ip[16];
-
-	if( session[fd]->flag.eof )
-	{
-		do_close(fd);
-		return 0;
-	}
-
-	if( sd == NULL ) {
-		sd = CREATE(session[fd]->session_data, struct login_session_data, 1);
-		sd->fd = fd;
-	}		
-
-	ipl = session[fd]->client_addr;
-	ip2str(ipl, ip);
-
-	while( RFIFOREST(fd) >= 2 )
-	{
-		uint16 command = RFIFOW(fd,0);
-
-		switch( command )
-		{
-
-		case 0x0200:		// New alive packet: structure: 0x200 <account.userid>.24B. used to verify if client is always alive.
-			if (RFIFOREST(fd) < 26)
-				return 0;
-			RFIFOSKIP(fd,26);
-		break;
-
-		case 0x0204:		// New alive packet: structure: 0x204 <encrypted.account.userid>.16B. (new ragexe from 22 june 2004)
-			if (RFIFOREST(fd) < 18)
-				return 0;
-			RFIFOSKIP(fd,18);
-		break;
-
-		case 0x0064:		// request client login
-		case 0x01dd:		// request client login (encryption mode)
-		case 0x0277:		// New login packet (kRO 2006-04-24aSakexe langtype 0)
-		case 0x02b0:		// New login packet (kRO 2007-05-14aSakexe langtype 0)
-		{
-			size_t packet_len = RFIFOREST(fd); // assume no other packet was sent
-
-			// Perform ip-ban check
-			if( login_config.ipban && login_ip_ban_check(ipl) )
-			{
-				ShowStatus("Connection refused: IP isn't authorised (deny/allow, ip: %s).\n", ip);
-				WFIFOHEAD(fd,23);
-				WFIFOW(fd,0) = 0x6a;
-				WFIFOB(fd,2) = 3; // 3 = Rejected from Server
-				WFIFOSET(fd,23);
-				RFIFOSKIP(fd,packet_len);
-				set_eof(fd);
-				break;
-			}
-
-			if( (command == 0x0064 && packet_len < 55)
-			||  (command == 0x01dd && packet_len < 47)
-			||  (command == 0x0277 && packet_len < 84)
-			||  (command == 0x02b0 && packet_len < 85) )
-				return 0;
-
-			// S 0064 <version>.l <account name>.24B <password>.24B <version2>.B
-			// S 01dd <version>.l <account name>.24B <md5 binary>.16B <version2>.B
-			// S 0277 <version>.l <account name>.24B <password>.24B <junk?>.29B <version2>.B
-			// S 02b0 <version>.l <account name>.24B <password>.24B <junk?>.30B <version2>.B
-
-			sd->version = RFIFOL(fd,2);
-			safestrncpy(sd->userid, (char*)RFIFOP(fd,6), NAME_LENGTH);//## does it have to be nul-terminated?
-			if (command != 0x01dd) {
-				ShowStatus("Request for connection of %s (ip: %s).\n", sd->userid, ip);
-				safestrncpy(sd->passwd, (char*)RFIFOP(fd,30), NAME_LENGTH);//## does it have to be nul-terminated?
-				sd->passwdenc = 0;
-			} else {
-				ShowStatus("Request for connection (encryption mode) of %s (ip: %s).\n", sd->userid, ip);
-				memcpy(sd->passwd, RFIFOP(fd,30), 16); sd->passwd[16] = '\0'; // raw binary data here!
-				sd->passwdenc = PASSWORDENC;
-			}
-			RFIFOSKIP(fd,packet_len);
-
-			result = mmo_auth(sd);
-
-			if( result == -1 )
-				login_auth_ok(sd);
-			else
-				login_auth_failed(sd, result);
-		}
-		break;
-
-		case 0x01db:	// Sending request of the coding key
-			RFIFOSKIP(fd,2);
-		{
-			unsigned int i;
-
-			memset(sd->md5key, '\0', sizeof(sd->md5key));
-			sd->md5keylen = (uint16)(12 + rand() % 4);
-			for( i = 0; i < sd->md5keylen; ++i )
-				sd->md5key[i] = (char)(1 + rand() % 255);
-
-			WFIFOHEAD(fd,4 + sd->md5keylen);
-			WFIFOW(fd,0) = 0x01dc;
-			WFIFOW(fd,2) = 4 + sd->md5keylen;
-			memcpy(WFIFOP(fd,4), sd->md5key, sd->md5keylen);
-			WFIFOSET(fd,WFIFOW(fd,2));
-		}
-		break;
-
-		case 0x2710:	// Connection request of a char-server
-			if (RFIFOREST(fd) < 86)
-				return 0;
-		{
-			char esc_userid[NAME_LENGTH*2+1];
-			char server_name[20];
-			char esc_server_name[20*2+1];
-			uint32 server_ip;
-			uint16 server_port;
-			uint16 maintenance;
-			uint16 new_;
-
-			safestrncpy(sd->userid, (char*)RFIFOP(fd,2), NAME_LENGTH);
-			safestrncpy(sd->passwd, (char*)RFIFOP(fd,26), NAME_LENGTH);
-			sd->passwdenc = 0;
-			sd->version = login_config.client_version_to_connect; // hack to skip version check
-			server_ip = ntohl(RFIFOL(fd,54));
-			server_port = ntohs(RFIFOW(fd,58));
-			safestrncpy(server_name, (char*)RFIFOP(fd,60), 20);
-			maintenance = RFIFOW(fd,82);
-			new_ = RFIFOW(fd,84);
-			RFIFOSKIP(fd,86);
-
-			Sql_EscapeStringLen(sql_handle, esc_server_name, server_name, strnlen(server_name, 20));
-			Sql_EscapeStringLen(sql_handle, esc_userid, sd->userid, strnlen(sd->userid, NAME_LENGTH));
-
-			ShowInfo("Connection request of the char-server '%s' @ %d.%d.%d.%d:%d (account: '%s', pass: '%s', ip: '%s')\n", server_name, CONVIP(server_ip), server_port, sd->userid, sd->passwd, ip);
-
-			if( login_config.log_login && SQL_ERROR == Sql_Query(sql_handle, "INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '%u', '%s@%s','100', 'charserver - %s@%u.%u.%u.%u:%d')",
-				loginlog_db, ipl, esc_userid, esc_server_name, esc_server_name, CONVIP(server_ip), server_port) )
-				Sql_ShowDebug(sql_handle);
-
-			result = mmo_auth(sd);
-			if( result == -1 && sd->sex == 'S' && sd->account_id < MAX_SERVERS && server[sd->account_id].fd == -1 )
-			{
-				ShowStatus("Connection of the char-server '%s' accepted.\n", server_name);
-				safestrncpy(server[sd->account_id].name, server_name, sizeof(server[sd->account_id].name));
-				server[sd->account_id].fd = fd;
-				server[sd->account_id].ip = server_ip;
-				server[sd->account_id].port = server_port;
-				server[sd->account_id].users = 0;
-				server[sd->account_id].maintenance = maintenance;
-				server[sd->account_id].new_ = new_;
-
-				session[fd]->func_parse = parse_fromchar;
-				session[fd]->flag.server = 1;
-				realloc_fifo(fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
-
-				// send connection success
-				WFIFOHEAD(fd,3);
-				WFIFOW(fd,0) = 0x2711;
-				WFIFOB(fd,2) = 0;
-				WFIFOSET(fd,3);
-
-				// send GM account to char-server
-				send_GM_accounts(fd);
-
-				if( SQL_ERROR == Sql_Query(sql_handle, "REPLACE INTO `sstatus`(`index`,`name`,`user`) VALUES ( '%d', '%s', '%d')", sd->account_id, esc_server_name, 0) )
-					Sql_ShowDebug(sql_handle);
-			}
-			else
-			{
-				ShowNotice("Connection of the char-server '%s' REFUSED.\n", server_name);
-				WFIFOHEAD(fd,3);
-				WFIFOW(fd,0) = 0x2711;
-				WFIFOB(fd,2) = 3;
-				WFIFOSET(fd,3);
-			}
-		}
-		return 0; // processing will continue elsewhere
-
-		case 0x7530:	// Server version information request
-			ShowStatus("Sending server version information to ip: %s\n", ip);
-			RFIFOSKIP(fd,2);
-			WFIFOHEAD(fd,10);
-			WFIFOW(fd,0) = 0x7531;
-			WFIFOB(fd,2) = ATHENA_MAJOR_VERSION;
-			WFIFOB(fd,3) = ATHENA_MINOR_VERSION;
-			WFIFOB(fd,4) = ATHENA_REVISION;
-			WFIFOB(fd,5) = ATHENA_RELEASE_FLAG;
-			WFIFOB(fd,6) = ATHENA_OFFICIAL_FLAG;
-			WFIFOB(fd,7) = ATHENA_SERVER_LOGIN;
-			WFIFOW(fd,8) = ATHENA_MOD_VERSION;
-			WFIFOSET(fd,10);
-		break;
-
-		default:
-			ShowNotice("Abnormal end of connection (ip: %s): Unknown packet 0x%x\n", ip, command);
-			set_eof(fd);
-			return 0;
-		}
-	}
-
-	RFIFOSKIP(fd,RFIFOREST(fd));
-	return 0;
-}
-
-//-----------------------
-// Console Command Parser [Wizputer]
-//-----------------------
-int parse_console(char* buf)
-{
-	char command[256];
-
-	memset(command, 0, sizeof(command));
-
-	sscanf(buf, "%[^\n]", command);
-
-	ShowInfo("Console command :%s", command);
-
-	if( strcmpi("shutdown", command) == 0 ||
-	    strcmpi("exit", command) == 0 ||
-	    strcmpi("quit", command) == 0 ||
-	    strcmpi("end", command) == 0 )
-		runflag = 0;
-	else
-	if( strcmpi("alive", command) == 0 ||
-	    strcmpi("status", command) == 0 )
-		ShowInfo(CL_CYAN"Console: "CL_BOLD"I'm Alive."CL_RESET"\n");
-	else
-	if( strcmpi("help", command) == 0 ) {
-		ShowInfo(CL_BOLD"Help of commands:"CL_RESET"\n");
-		ShowInfo("  To shutdown the server:\n");
-		ShowInfo("  'shutdown|exit|quit|end'\n");
-		ShowInfo("  To know if server is alive:\n");
-		ShowInfo("  'alive|status'\n");
-	}
-
-	return 0;
-}
-
-static int online_data_cleanup_sub(DBKey key, void *data, va_list ap)
-{
-	struct online_login_data *character= (struct online_login_data*)data;
-	if (character->char_server == -2) //Unknown server.. set them offline
-		remove_online_user(character->account_id);
-	return 0;
-}
-
-static int online_data_cleanup(int tid, unsigned int tick, int id, intptr data)
-{
-	online_db->foreach(online_db, online_data_cleanup_sub);
-	return 0;
-} 
-
-//----------------------------------
-// Reading Lan Support configuration
-//----------------------------------
-int login_lan_config_read(const char *lancfgName)
-{
-	FILE *fp;
-	int line_num = 0;
-	char line[1024], w1[64], w2[64], w3[64], w4[64];
-
-	if((fp = fopen(lancfgName, "r")) == NULL) {
-		ShowWarning("LAN Support configuration file is not found: %s\n", lancfgName);
-		return 1;
-	}
-
-	ShowInfo("Reading the configuration file %s...\n", lancfgName);
-
-	while(fgets(line, sizeof(line), fp))
-	{
-		line_num++;
-		if ((line[0] == '/' && line[1] == '/') || line[0] == '\n' || line[1] == '\n')
-			continue;
-
-		if(sscanf(line,"%[^:]: %[^:]:%[^:]:%[^\r\n]", w1, w2, w3, w4) != 4)
-		{
-			ShowWarning("Error syntax of configuration file %s in line %d.\n", lancfgName, line_num);
-			continue;
-		}
-
-		if( strcmpi(w1, "subnet") == 0 )
-		{
-			subnet[subnet_count].mask = str2ip(w2);
-			subnet[subnet_count].char_ip = str2ip(w3);
-			subnet[subnet_count].map_ip = str2ip(w4);
-
-			if( (subnet[subnet_count].char_ip & subnet[subnet_count].mask) != (subnet[subnet_count].map_ip & subnet[subnet_count].mask) )
-			{
-				ShowError("%s: Configuration Error: The char server (%s) and map server (%s) belong to different subnetworks!\n", lancfgName, w3, w4);
-				continue;
-			}
-
-			subnet_count++;
-		}
-	}
-
-	ShowStatus("Read information about %d subnetworks.\n", subnet_count);
-
-	fclose(fp);
-	return 0;
-}
-
-//-----------------------------------------------------
-// clear expired ip bans
-//-----------------------------------------------------
-int ip_ban_flush(int tid, unsigned int tick, int id, intptr data)
-{
-	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `ipbanlist` WHERE `rtime` <= NOW()") )
-		Sql_ShowDebug(sql_handle);
-
-	return 0;
-}
-
-//-----------------------------------
-// Reading main configuration file
-//-----------------------------------
-int login_config_read(const char* cfgName)
-{
-	char line[1024], w1[1024], w2[1024];
-	FILE* fp = fopen(cfgName, "r");
-	if (fp == NULL) {
-		ShowError("Configuration file (%s) not found.\n", cfgName);
-		return 1;
-	}
-	ShowInfo("Reading configuration file %s...\n", cfgName);
-	while(fgets(line, sizeof(line), fp))
-	{
-		if (line[0] == '/' && line[1] == '/')
-			continue;
-
-		if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) < 2)
-			continue;
-
-		if(!strcmpi(w1,"timestamp_format"))
-			strncpy(timestamp_format, w2, 20);
-		else if(!strcmpi(w1,"stdout_with_ansisequence"))
-			stdout_with_ansisequence = config_switch(w2);
-		else if(!strcmpi(w1,"console_silent")) {
-			ShowInfo("Console Silent Setting: %d\n", atoi(w2));
-			msg_silent = atoi(w2);
-		}
-		else if( !strcmpi(w1, "bind_ip") ) {
-			char ip_str[16];
-			login_config.login_ip = host2ip(w2);
-			if( login_config.login_ip )
-				ShowStatus("Login server binding IP address : %s -> %s\n", w2, ip2str(login_config.login_ip, ip_str));
-		}
-		else if( !strcmpi(w1, "login_port") ) {
-			login_config.login_port = (uint16)atoi(w2);
-			ShowStatus("set login_port : %s\n",w2);
-		}
-		else if(!strcmpi(w1, "log_login"))
-			login_config.log_login = (bool)config_switch(w2);
-
-		else if(!strcmpi(w1, "ipban"))
-			login_config.ipban = (bool)config_switch(w2);
-		else if(!strcmpi(w1, "dynamic_pass_failure_ban"))
-			login_config.dynamic_pass_failure_ban = (bool)config_switch(w2);
-		else if(!strcmpi(w1, "dynamic_pass_failure_ban_interval"))
-			login_config.dynamic_pass_failure_ban_interval = atoi(w2);
-		else if(!strcmpi(w1, "dynamic_pass_failure_ban_limit"))
-			login_config.dynamic_pass_failure_ban_limit = atoi(w2);
-		else if(!strcmpi(w1, "dynamic_pass_failure_ban_duration"))
-			login_config.dynamic_pass_failure_ban_duration = atoi(w2);
-
-		else if(!strcmpi(w1, "new_account"))
-			login_config.new_account_flag = (bool)config_switch(w2);
-		else if(!strcmpi(w1, "start_limited_time"))
-			login_config.start_limited_time = atoi(w2);
-		else if(!strcmpi(w1, "check_client_version"))
-			login_config.check_client_version = (bool)config_switch(w2);
-		else if(!strcmpi(w1, "client_version_to_connect"))
-			login_config.client_version_to_connect = atoi(w2);
-		else if(!strcmpi(w1, "use_MD5_passwords"))
-			login_config.use_md5_passwds = (bool)config_switch(w2);
-		else if(!strcmpi(w1, "min_level_to_connect"))
-			login_config.min_level_to_connect = atoi(w2);
-		else if(!strcmpi(w1, "date_format"))
-			safestrncpy(login_config.date_format, w2, sizeof(login_config.date_format));
-		else if(!strcmpi(w1, "console"))
-			login_config.console = (bool)config_switch(w2);
-		else if(!strcmpi(w1, "case_sensitive"))
-			login_config.case_sensitive = (bool)config_switch(w2);
-		else if(!strcmpi(w1, "allowed_regs")) //account flood protection system
-			allowed_regs = atoi(w2);
-		else if(!strcmpi(w1, "time_allowed"))
-			time_allowed = atoi(w2);
-		else if(!strcmpi(w1, "online_check"))
-			login_config.online_check = (bool)config_switch(w2);
-		else if(!strcmpi(w1, "use_dnsbl"))
-			login_config.use_dnsbl = (bool)config_switch(w2);
-		else if(!strcmpi(w1, "dnsbl_servers"))
-			safestrncpy(login_config.dnsbl_servs, w2, sizeof(login_config.dnsbl_servs));
-		else if(!strcmpi(w1, "ip_sync_interval"))
-			login_config.ip_sync_interval = (unsigned int)1000*60*atoi(w2); //w2 comes in minutes.
-		else if(!strcmpi(w1, "import"))
-			login_config_read(w2);
-	}
-	fclose(fp);
-	ShowInfo("Finished reading %s.\n", cfgName);
-	return 0;
-}
-
-void sql_config_read(const char* cfgName)
-{
-	char line[1024], w1[1024], w2[1024];
-	FILE* fp = fopen(cfgName, "r");
-	if(fp == NULL) {
-		ShowError("file not found: %s\n", cfgName);
-		return;
-	}
-	ShowInfo("reading configuration file %s...\n", cfgName);
-	while(fgets(line, sizeof(line), fp))
-	{
-		if (line[0] == '/' && line[1] == '/')
-			continue;
-		if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) < 2)
-			continue;
-
-		if (!strcmpi(w1, "gm_read_method"))
-			login_config.login_gm_read = (atoi(w2) == 0);
-		else if (!strcmpi(w1, "login_db"))
-			strcpy(login_db, w2);
-		else if (!strcmpi(w1, "login_server_ip"))
-			strcpy(login_server_ip, w2);
-		else if (!strcmpi(w1, "login_server_port"))
-			login_server_port = (uint16)atoi(w2);
-		else if (!strcmpi(w1, "login_server_id"))
-			strcpy(login_server_id, w2);
-		else if (!strcmpi(w1, "login_server_pw"))
-			strcpy(login_server_pw, w2);
-		else if (!strcmpi(w1, "login_server_db"))
-			strcpy(login_server_db, w2);
-		else if (!strcmpi(w1, "default_codepage"))
-			strcpy(default_codepage, w2);
-		else if (!strcmpi(w1, "login_db_account_id"))
-			strcpy(login_db_account_id, w2);
-		else if (!strcmpi(w1, "login_db_userid"))
-			strcpy(login_db_userid, w2);
-		else if (!strcmpi(w1, "login_db_user_pass"))
-			strcpy(login_db_user_pass, w2);
-		else if (!strcmpi(w1, "login_db_level"))
-			strcpy(login_db_level, w2);
-		else if (!strcmpi(w1, "loginlog_db"))
-			strcpy(loginlog_db, w2);
-		else if (!strcmpi(w1, "reg_db"))
-			strcpy(reg_db, w2);
-		else if (!strcmpi(w1, "import"))
-			sql_config_read(w2);
-	}
-	fclose(fp);
-	ShowInfo("Done reading %s.\n", cfgName);
-}
-
-void login_set_defaults()
-{
-	login_config.login_ip = INADDR_ANY;
-	login_config.login_port = 6900;
-	login_config.ip_sync_interval = 0;
-	login_config.log_login = true;
-	safestrncpy(login_config.date_format, "%Y-%m-%d %H:%M:%S", sizeof(login_config.date_format));
-	login_config.console = false;
-	login_config.new_account_flag = true;
-	login_config.case_sensitive = true;
-	login_config.use_md5_passwds = false;
-	login_config.login_gm_read = true;
-	login_config.min_level_to_connect = 0;
-	login_config.online_check = true;
-	login_config.check_client_version = false;
-	login_config.client_version_to_connect = 20;
-
-	login_config.ipban = true;
-	login_config.dynamic_pass_failure_ban = true;
-	login_config.dynamic_pass_failure_ban_interval = 5;
-	login_config.dynamic_pass_failure_ban_limit = 7;
-	login_config.dynamic_pass_failure_ban_duration = 5;
-	login_config.use_dnsbl = false;
-	safestrncpy(login_config.dnsbl_servs, "", sizeof(login_config.dnsbl_servs));
-}
-
-//--------------------------------------
-// Function called at exit of the server
-//--------------------------------------
-void do_final(void)
-{
-	int i, fd;
-	ShowStatus("Terminating...\n");
-
-	mmo_db_close();
-	online_db->destroy(online_db, NULL);
-	auth_db->destroy(auth_db, NULL);
-
-	if(gm_account_db) aFree(gm_account_db);
-
-	for (i = 0; i < MAX_SERVERS; i++) {
-		if ((fd = server[i].fd) >= 0) {
-			memset(&server[i], 0, sizeof(struct mmo_char_server));
-			server[i].fd = -1;
-			do_close(fd);
-		}
-	}
-	do_close(login_fd);
-
-	ShowStatus("Finished.\n");
-}
-
-//------------------------------
-// Function called when the server
-// has received a crash signal.
-//------------------------------
-void do_abort(void)
-{
-}
-
-void set_server_type(void)
-{
-	SERVER_TYPE = ATHENA_SERVER_LOGIN;
-}
-
-//------------------------------
-// Login server initialization
-//------------------------------
-int do_init(int argc, char** argv)
-{
-	int i;
-
-	login_set_defaults();
-
-	// read login-server configuration
-	login_config_read((argc > 1) ? argv[1] : LOGIN_CONF_NAME);
-	sql_config_read(SQL_CONF_NAME);
-	login_lan_config_read((argc > 2) ? argv[2] : LAN_CONF_NAME);
-
-	srand((unsigned int)time(NULL));
-
-	for( i = 0; i < MAX_SERVERS; i++ )
-		server[i].fd = -1;
-
-	// Online user database init
-	online_db = idb_alloc(DB_OPT_RELEASE_DATA);
-	add_timer_func_list(waiting_disconnect_timer, "waiting_disconnect_timer");
-
-	// Auth init
-	auth_db = idb_alloc(DB_OPT_RELEASE_DATA);
-	mmo_auth_sqldb_init();
-
-	// Read account information.
-	if(login_config.login_gm_read)
-		read_gm_account();
-
-	// set default parser as parse_login function
-	set_defaultparse(parse_login);
-
-	// ban deleter timer
-	add_timer_func_list(ip_ban_flush, "ip_ban_flush");
-	add_timer_interval(gettick()+10, ip_ban_flush, 0, 0, 60*1000);
-
-	// every 10 minutes cleanup online account db.
-	add_timer_func_list(online_data_cleanup, "online_data_cleanup");
-	add_timer_interval(gettick() + 600*1000, online_data_cleanup, 0, 0, 600*1000);
-
-	// add timer to detect ip address change and perform update
-	if (login_config.ip_sync_interval) {
-		add_timer_func_list(sync_ip_addresses, "sync_ip_addresses");
-		add_timer_interval(gettick() + login_config.ip_sync_interval, sync_ip_addresses, 0, 0, login_config.ip_sync_interval);
-	}
-
-	if( login_config.console )
-	{
-		//##TODO invoke a CONSOLE_START plugin event
-	}
-
-	new_reg_tick = gettick();
-
-	// server port open & binding
-	login_fd = make_listen_bind(login_config.login_ip, login_config.login_port);
-
-	ShowStatus("The login-server is "CL_GREEN"ready"CL_RESET" (Server is listening on the port %u).\n\n", login_config.login_port);
-
-	return 0;
-}
diff --git a/src/login_sql/login.h b/src/login_sql/login.h
deleted file mode 100644
index d343c0905..000000000
--- a/src/login_sql/login.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
-
-#ifndef _LOGIN_SQL_H_
-#define _LOGIN_SQL_H_
-
-#include "../common/mmo.h" // NAME_LENGTH
-
-#define LOGIN_CONF_NAME	"conf/login_athena.conf"
-#define SQL_CONF_NAME "conf/inter_athena.conf"
-#define LAN_CONF_NAME "conf/subnet_athena.conf"
-
-// supported encryption types: 1- passwordencrypt, 2- passwordencrypt2, 3- both
-#define PASSWORDENC 3
-
-struct login_session_data {
-
-	int account_id;
-	long login_id1;
-	long login_id2;
-	char sex;
-
-	char userid[NAME_LENGTH];
-	char passwd[NAME_LENGTH];
-	int passwdenc;
-	char md5key[20];
-	uint16 md5keylen;
-
-	char lastlogin[24];
-	uint8 level;
-	int version;
-
-	int fd;
-};
-
-struct mmo_char_server {
-	char name[20];
-	int fd;
-	uint32 ip;
-	uint16 port;
-	int users;
-	int maintenance;
-	int new_;
-};
-
-struct Login_Config {
-
-	uint32 login_ip;                                // the address to bind to
-	uint16 login_port;                              // the port to bind to
-	unsigned int ip_sync_interval;                  // interval (in minutes) to execute a DNS/IP update (for dynamic IPs)
-	bool log_login;                                 // whether to log login server actions or not
-	char date_format[32];                           // date format used in messages
-	bool console;                                   // console input system enabled?
-	bool new_account_flag;                          // autoregistration via _M/_F ?
-	int start_limited_time;                         // new account expiration time (-1: unlimited)
-	bool case_sensitive;                            // are logins case sensitive ?
-	bool use_md5_passwds;                           // work with password hashes instead of plaintext passwords?
-	bool login_gm_read;                             // should the login server handle info about gm accounts?
-	int min_level_to_connect;                       // minimum level of player/GM (0: player, 1-99: GM) to connect
-	bool online_check;                              // reject incoming players that are already registered as online ?
-	bool check_client_version;                      // check the clientversion set in the clientinfo ?
-	int client_version_to_connect;                  // the client version needed to connect (if checking is enabled)
-
-	bool ipban;                                     // perform IP blocking (via contents of `ipbanlist`) ?
-	bool dynamic_pass_failure_ban;                  // automatic IP blocking due to failed login attemps ?
-	unsigned int dynamic_pass_failure_ban_interval; // how far to scan the loginlog for password failures
-	unsigned int dynamic_pass_failure_ban_limit;    // number of failures needed to trigger the ipban
-	unsigned int dynamic_pass_failure_ban_duration; // duration of the ipban
-	bool use_dnsbl;                                 // dns blacklist blocking ?
-	char dnsbl_servs[1024];                         // comma-separated list of dnsbl servers
-
-};
-
-struct mmo_account {
-
-	int account_id;
-	char sex;
-	char userid[24];
-	char pass[32+1]; // 23+1 for normal, 32+1 for md5-ed passwords
-	char lastlogin[24];
-	int logincount;
-	uint32 state; // packet 0x006a value + 1 (0: compte OK)
-	char email[40]; // e-mail (by default: a@a.com)
-	char error_message[20]; // Message of error code #6 = Your are Prohibited to log in until %s (packet 0x006a)
-	time_t unban_time; // # of seconds 1/1/1970 (timestamp): ban time limit of the account (0 = no ban)
-	time_t expiration_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited)
-	char last_ip[16]; // save of last IP of connection
-	char memo[255]; // a memo field
-	int account_reg2_num;
-	struct global_reg account_reg2[ACCOUNT_REG2_NUM]; // account script variables (stored on login server)
-};
-
-
-#endif /* _LOGIN_SQL_H_ */
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 91727695b..dab99cb51 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -4188,19 +4188,6 @@ int atcommand_reloadscript(const int fd, struct map_session_data* sd, const char
 }
 
 /*==========================================
- * @reloadgmdb - reloads gm levels from where they are stored (gm_account.txt / mysql database)
- *------------------------------------------*/
-int atcommand_reloadgmdb(const int fd, struct map_session_data* sd, const char* command, const char* message)
-{
-	nullpo_retr(-1, sd);
-	chrif_reloadGMdb();
-
-	clif_displaymessage(fd, msg_txt(101)); // Login-server asked to reload GM accounts and their level.
-
-	return 0;
-}
-
-/*==========================================
  * @mapinfo <map name> [0-3] by MC_Cameri
  * => Shows information about the map [map name]
  * 0 = no additional information
@@ -6632,7 +6619,7 @@ int atcommand_adjgmlvl(const int fd, struct map_session_data* sd, const char* co
 		return -1;
 	}
 
-    pc_set_gm_level(pl_sd->status.account_id, newlev);
+	sd->gmlevel = newlev;
 
     return 0;
 }
@@ -8191,7 +8178,7 @@ int atcommand_request(const int fd, struct map_session_data* sd, const char* com
 	}
 
 	sprintf(atcmd_output, msg_txt(278), message);	// (@request): %s
-	intif_wis_message_to_gm(sd->status.name, lowest_gm_level, atcmd_output);
+	intif_wis_message_to_gm(sd->status.name, battle_config.lowest_gm_level, atcmd_output);
 	clif_disp_onlyself(sd, atcmd_output, strlen(atcmd_output));
 	clif_displaymessage(sd->fd,msg_txt(279));	// @request sent.
 	return 0;
@@ -8400,7 +8387,6 @@ AtCommandInfo atcommand_info[] = {
 	{ "reloadmobdb",       99,     atcommand_reloadmobdb },
 	{ "reloadskilldb",     99,     atcommand_reloadskilldb },
 	{ "reloadscript",      99,     atcommand_reloadscript },
-	{ "reloadgmdb",        99,     atcommand_reloadgmdb },
 	{ "reloadatcommand",   99,     atcommand_reloadatcommand },
 	{ "reloadbattleconf",  99,     atcommand_reloadbattleconf },
 	{ "reloadstatusdb",    99,     atcommand_reloadstatusdb },
diff --git a/src/map/battle.c b/src/map/battle.c
index d7bae3c0e..98fc40062 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3395,6 +3395,7 @@ static const struct _battle_data {
 	{ "guild_max_castles",                  &battle_config.guild_max_castles,               0,      0,      INT_MAX,        },
 	{ "guild_skill_relog_delay",            &battle_config.guild_skill_relog_delay,         0,      0,      1,              },
 	{ "emergency_call",                     &battle_config.emergency_call,                  11,     0,      31,             },
+	{ "lowest_gm_level",                    &battle_config.lowest_gm_level,                 1,      0,      99,             },
 	{ "atcommand_gm_only",                  &battle_config.atc_gmonly,                      0,      0,      1,              },
 	{ "atcommand_spawn_quantity_limit",     &battle_config.atc_spawn_quantity_limit,        100,    0,      INT_MAX,        },
 	{ "atcommand_slave_clone_limit",        &battle_config.atc_slave_clone_limit,           25,     0,      INT_MAX,        },
diff --git a/src/map/battle.h b/src/map/battle.h
index bb7e53278..cb3b0f265 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -141,6 +141,7 @@ extern struct Battle_Config
 	int monster_max_aspd;
 	int view_range_rate;
 	int chase_range_rate;
+	int lowest_gm_level;
 	int atc_gmonly;
 	int atc_spawn_quantity_limit;
 	int atc_slave_clone_limit;
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 725fbcc07..a46186fc1 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -36,7 +36,7 @@ static const int packet_len_table[0x3d] = { // U - used, F - free
 	60, 3,-1,27,10,-1, 6,-1,	// 2af8-2aff: U->2af8, U->2af9, U->2afa, U->2afb, U->2afc, U->2afd, U->2afe, U->2aff
 	 6,-1,18, 7,-1,35,30,-1,	// 2b00-2b07: U->2b00, U->2b01, U->2b02, U->2b03, U->2b04, U->2b05, U->2b06, F->2b07
 	 6,30,-1,-1,86, 7,44,34,	// 2b08-2b0f: U->2b08, U->2b09, F->2b0a, F->2b0b, U->2b0c, U->2b0d, U->2b0e, U->2b0f
-	11,10,10, 6,11,-1,266,10,	// 2b10-2b17: U->2b10, U->2b11, U->2b12, U->2b13, U->2b14, U->2b15, U->2b16, U->2b17
+	11,10,10, 6,11,-1,266,10,	// 2b10-2b17: U->2b10, U->2b11, U->2b12, U->2b13, U->2b14, F->2b15, U->2b16, U->2b17
 	 2,10, 2,-1,-1,-1, 2, 7,	// 2b18-2b1f: U->2b18, U->2b19, U->2b1a, U->2b1b, U->2b1c, U->2b1d, U->2b1e, U->2b1f
 	-1,10, 8, 2, 2,14,19,19,	// 2b20-2b27: U->2b20, U->2b21, U->2b22, U->2b23, U->2b24, U->2b25, U->2b26, U->2b27
 };
@@ -71,7 +71,7 @@ static const int packet_len_table[0x3d] = { // U - used, F - free
 //2b12: Incoming, chrif_divorceack -> 'divorce chars
 //2b13: Incoming, chrif_accountdeletion -> 'Delete acc XX, if the player is on, kick ....'
 //2b14: Incoming, chrif_accountban -> 'not sure: kick the player with message XY'
-//2b15: Incoming, chrif_recvgmaccounts -> 'receive gm accs from charserver (seems to be incomplete !)'
+//2b15: FREE
 //2b16: Outgoing, chrif_ragsrvinfo -> 'sends motd / rates ....'
 //2b17: Outgoing, chrif_char_offline -> 'tell the charserver that the char is now offline'
 //2b18: Outgoing, chrif_char_reset_offline -> 'set all players OFF!'
@@ -512,56 +512,58 @@ int chrif_scdata_request(int account_id, int char_id)
 }
 
 /*==========================================
- * new auth system [Kevin]
+ * Request auth confirmation
  *------------------------------------------*/
 void chrif_authreq(struct map_session_data *sd)
 {
 	struct auth_node *node= chrif_search(sd->bl.id);
 
-	if(!node) {
-		//request data from char server and store current auth info
-		WFIFOHEAD(char_fd,19);
-		WFIFOW(char_fd,0) = 0x2b26;
-		WFIFOL(char_fd,2) = sd->status.account_id;
-		WFIFOL(char_fd,6) = sd->status.char_id;
-		WFIFOL(char_fd,10) = sd->login_id1;
-		WFIFOB(char_fd,14) = sd->status.sex;
-		WFIFOL(char_fd,15) = htonl(session[sd->fd]->client_addr);
-		WFIFOSET(char_fd,19);
-		chrif_sd_to_auth(sd, ST_LOGIN);
+	if( node != NULL )
+	{
+		set_eof(sd->fd);
 		return;
-	} else {	//char already online? kick connect request and tell char server that this person is online
-					//This case shouldn't happen in an ideal system
-		pc_authfail(sd);
-		chrif_char_online(sd);
 	}
-	return;
+
+	WFIFOHEAD(char_fd,19);
+	WFIFOW(char_fd,0) = 0x2b26;
+	WFIFOL(char_fd,2) = sd->status.account_id;
+	WFIFOL(char_fd,6) = sd->status.char_id;
+	WFIFOL(char_fd,10) = sd->login_id1;
+	WFIFOB(char_fd,14) = sd->status.sex;
+	WFIFOL(char_fd,15) = htonl(session[sd->fd]->client_addr);
+	WFIFOSET(char_fd,19);
+	chrif_sd_to_auth(sd, ST_LOGIN);
 }
 
-//character selected, insert into auth db
+/*==========================================
+ * Auth confirmation ack
+ *------------------------------------------*/
 void chrif_authok(int fd)
 {
 	int account_id;
 	uint32 login_id1;
-	time_t expiration_time;
 	uint32 login_id2;
+	time_t expiration_time;
+	int gmlevel;
 	struct mmo_charstatus* status;
 	int char_id;
 	struct auth_node *node;
 	TBL_PC* sd;
 
 	//Check if both servers agree on the struct's size
-	if( RFIFOW(fd,2) - 20 != sizeof(struct mmo_charstatus) )
+	if( RFIFOW(fd,2) - 24 != sizeof(struct mmo_charstatus) )
 	{
-		ShowError("chrif_authok: Data size mismatch! %d != %d\n", RFIFOW(fd,2) - 20, sizeof(struct mmo_charstatus));
+		ShowError("chrif_authok: Data size mismatch! %d != %d\n", RFIFOW(fd,2) - 24, sizeof(struct mmo_charstatus));
 		return;
 	}
 
 	account_id = RFIFOL(fd,4);
 	login_id1 = RFIFOL(fd,8);
-	expiration_time = (time_t)(int32)RFIFOL(fd,12);
-	login_id2 = RFIFOL(fd,16);
-	status = (struct mmo_charstatus*)RFIFOP(fd,20);
+	login_id2 = RFIFOL(fd,12);
+	expiration_time = (time_t)(int32)RFIFOL(fd,16);
+	gmlevel = RFIFOL(fd,20);
+	status = (struct mmo_charstatus*)RFIFOP(fd,24);
+
 	char_id = status->char_id;
 
 	//Check if we don't already have player data in our server
@@ -569,33 +571,35 @@ void chrif_authok(int fd)
 	if ((sd = map_id2sd(account_id)) != NULL)
 		return;
 	
-	if ((node = chrif_search(account_id)))
-	{	//Is the character already awaiting authorization?
-		if (node->state != ST_LOGIN)
-			return; //character in logout phase, do not touch that data.
-		if (node->sd)
-		{
-			sd = node->sd;
-			if(node->char_dat == NULL &&
-				node->account_id == account_id &&
-				node->char_id == char_id &&
-				node->login_id1 == login_id1 )
-			{ //Auth Ok
-				if (pc_authok(sd, login_id2, expiration_time, status))
-				{
-					return;
-				}
-			} else { //Auth Failed
-				pc_authfail(sd);
-			}
-			chrif_char_offline(sd); //Set client offline
-			chrif_auth_delete(account_id, char_id, ST_LOGIN);
-			return;
-		}
+	if ((node = chrif_search(account_id)) == NULL)
+		return; // should not happen
+
+	if (node->state != ST_LOGIN)
+		return; //character in logout phase, do not touch that data.
+
+	if (node->sd == NULL)
+	{
+		/*
 		//When we receive double login info and the client has not connected yet,
 		//discard the older one and keep the new one.
 		chrif_auth_delete(node->account_id, node->char_id, ST_LOGIN);
+		*/
+		return; // should not happen
+	}
+
+	sd = node->sd;
+	if(node->char_dat == NULL &&
+		node->account_id == account_id &&
+		node->char_id == char_id &&
+		node->login_id1 == login_id1 )
+	{ //Auth Ok
+		if (pc_authok(sd, login_id2, expiration_time, gmlevel, status))
+			return;
+	} else { //Auth Failed
+		pc_authfail(sd);
 	}
+	chrif_char_offline(sd); //Set him offline, the char server likely has it set as online already.
+	chrif_auth_delete(account_id, char_id, ST_LOGIN);
 }
 
 // client authentication failed
@@ -1036,30 +1040,6 @@ int chrif_disconnectplayer(int fd)
 }
 
 /*==========================================
- * Request to reload GM accounts and their levels: send to char-server by [Yor]
- *------------------------------------------*/
-int chrif_reloadGMdb(void)
-{
-	chrif_check(-1);
-
-	WFIFOHEAD(char_fd,2);
-	WFIFOW(char_fd,0) = 0x2af7;
-	WFIFOSET(char_fd,2);
-
-	return 0;
-}
-
-/*==========================================
- * Receiving GM accounts and their levels from char-server by [Yor]
- *------------------------------------------*/
-int chrif_recvgmaccounts(int fd)
-{
-	int nAccounts = pc_read_gm_account(fd);
-	ShowInfo("From login-server: receiving information of '"CL_WHITE"%d"CL_RESET"' GM accounts.\n", nAccounts);
-	return 0;
-}
-
-/*==========================================
  * Request/Receive top 10 Fame character list
  *------------------------------------------*/
 
@@ -1454,7 +1434,6 @@ int chrif_parse(int fd)
 		case 0x2b12: chrif_divorceack(RFIFOL(fd,2), RFIFOL(fd,6)); break;
 		case 0x2b13: chrif_accountdeletion(fd); break;
 		case 0x2b14: chrif_accountban(fd); break;
-		case 0x2b15: chrif_recvgmaccounts(fd); break;
 		case 0x2b1b: chrif_recvfamelist(fd); break;
 		case 0x2b1d: chrif_load_scdata(fd); break;
 		case 0x2b1e: chrif_update_ip(fd); break;
diff --git a/src/map/chrif.h b/src/map/chrif.h
index a8487533c..9ff5b9a0e 100644
--- a/src/map/chrif.h
+++ b/src/map/chrif.h
@@ -44,7 +44,6 @@ int chrif_changemapserver(struct map_session_data* sd, uint32 ip, uint16 port);
 int chrif_searchcharid(int char_id);
 int chrif_changeemail(int id, const char *actual_email, const char *new_email);
 int chrif_char_ask_name(int acc, const char* character_name, unsigned short operation_type, int year, int month, int day, int hour, int minute, int second);
-int chrif_reloadGMdb(void);
 int chrif_updatefamelist(struct map_session_data *sd);
 int chrif_buildfamelist(void);
 int chrif_save_scdata(struct map_session_data *sd);
diff --git a/src/map/map.c b/src/map/map.c
index 07d353aed..8c80644d0 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -79,8 +79,6 @@ Sql* logmysql_handle;
 
 #endif /* not TXT_ONLY */
 
-int lowest_gm_level = 1;
-
 // This param using for sending mainchat
 // messages like whispers to this nick. [LuzZza]
 char main_chat_nick[16] = "Main";
@@ -2955,13 +2953,8 @@ int inter_config_read(char *cfgName)
 		i=sscanf(line,"%[^:]: %[^\r\n]",w1,w2);
 		if(i!=2)
 			continue;
-		if(strcmpi(w1,"party_share_level")==0){
-			party_share_level = config_switch(w2);
-		} else if(strcmpi(w1,"lowest_gm_level")==0){
-			lowest_gm_level = atoi(w2);
-		
-		/* Main chat nick [LuzZza] */
-		} else if(strcmpi(w1, "main_chat_nick")==0){
+
+		if(strcmpi(w1, "main_chat_nick")==0){
 			strcpy(main_chat_nick, w2);
 			
 	#ifndef TXT_ONLY
@@ -3068,37 +3061,6 @@ int log_sql_init(void)
 	return 0;
 }
 
-/*=============================================
- * Does a mysql_ping to all connection handles
- *---------------------------------------------*/
-int map_sql_ping(int tid, unsigned int tick, int id, intptr data) 
-{
-	ShowInfo("Pinging SQL server to keep connection alive...\n");
-	Sql_Ping(mmysql_handle);
-	if (log_config.sql_logs)
-		Sql_Ping(logmysql_handle);
-	return 0;
-}
-
-int sql_ping_init(void)
-{
-	uint32 connection_timeout, connection_ping_interval;
-
-	// set a default value
-	connection_timeout = 28800; // 8 hours
-
-	// ask the mysql server for the timeout value
-	Sql_GetTimeout(mmysql_handle, &connection_timeout);
-	if (connection_timeout < 60)
-		connection_timeout = 60;
-
-	// establish keepalive
-	connection_ping_interval = connection_timeout - 30; // 30-second reserve
-	add_timer_func_list(map_sql_ping, "map_sql_ping");
-	add_timer_interval(gettick() + connection_ping_interval*1000, map_sql_ping, 0, 0, connection_ping_interval*1000);
-
-	return 0;
-}
 #endif /* not TXT_ONLY */
 
 int map_db_final(DBKey k,void *d,va_list ap)
@@ -3436,8 +3398,6 @@ int do_init(int argc, char *argv[])
 #ifndef TXT_ONLY /* mail system [Valaris] */
 	if (log_config.sql_logs)
 		log_sql_init();
-
-	sql_ping_init();
 #endif /* not TXT_ONLY */
 
 	npc_event_do_oninit();	// npcのOnInitイベント?行
diff --git a/src/map/map.h b/src/map/map.h
index 2f46c4e3e..429370a95 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -633,7 +633,6 @@ typedef struct homun_data       TBL_HOM;
 	( ((bl) == (struct block_list*)NULL || (bl)->type != (type_)) ? (T ## type_ *)NULL : (T ## type_ *)(bl) )
 
 
-extern int lowest_gm_level;
 extern char main_chat_nick[16];
 
 #ifndef TXT_ONLY
diff --git a/src/map/npc_chat.c b/src/map/npc_chat.c
index 44c9ce82e..d7edf69f0 100644
--- a/src/map/npc_chat.c
+++ b/src/map/npc_chat.c
@@ -14,7 +14,7 @@
 #include "pc.h" // struct map_session_data
 #include "script.h" // set_var()
 
-#include "pcre.h"
+#include <pcre.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/map/party.c b/src/map/party.c
index 28c5154e7..82cecc3ff 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -28,7 +28,6 @@
 
 
 static DBMap* party_db; // int party_id -> struct party_data*
-int party_share_level = 10;
 int party_send_xy_timer(int tid, unsigned int tick, int id, intptr data);
 
 /*==========================================
diff --git a/src/map/party.h b/src/map/party.h
index 65f585b10..9ad729c28 100644
--- a/src/map/party.h
+++ b/src/map/party.h
@@ -31,8 +31,6 @@ struct party_data {
 };
 
 
-extern int party_share_level;
-
 void do_init_party(void);
 void do_final_party(void);
 struct party_data* party_search(int party_id);
diff --git a/src/map/pc.c b/src/map/pc.c
index 3c9d5756a..bb24b097a 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -6,7 +6,7 @@
 #include "../common/malloc.h"
 #include "../common/nullpo.h"
 #include "../common/showmsg.h"
-#include "../common/socket.h" // RFIFO*()
+#include "../common/socket.h" // session[]
 #include "../common/strlib.h" // safestrncpy()
 #include "../common/timer.h"
 #include "../common/utils.h"
@@ -58,9 +58,6 @@ struct fame_list taekwon_fame_list[MAX_FAME_LIST];
 
 static unsigned short equip_pos[EQI_MAX]={EQP_ACC_L,EQP_ACC_R,EQP_SHOES,EQP_GARMENT,EQP_HEAD_LOW,EQP_HEAD_MID,EQP_HEAD_TOP,EQP_ARMOR,EQP_HAND_L,EQP_HAND_R,EQP_AMMO};
 
-static struct gm_account *gm_account = NULL;
-static int GM_num = 0;
-
 #define MOTD_LINE_SIZE 128
 char motd_text[MOTD_LINE_SIZE][256]; // Message of the day buffer [Valaris]
 
@@ -85,34 +82,7 @@ int pc_class2idx(int class_) {
 
 int pc_isGM(struct map_session_data* sd)
 {
-	int i;
-	nullpo_retr(0, sd);
-
-	if( sd->bl.type != BL_PC )
-		return 99;
-
-	ARR_FIND( 0, GM_num, i, gm_account[i].account_id == sd->status.account_id );
-	return ( i < GM_num ) ? gm_account[i].level : 0;
-}
-
-int pc_set_gm_level(int account_id, int level)
-{
-    int i;
-
-	ARR_FIND( 0, GM_num, i, account_id == gm_account[i].account_id );
-	if( i < GM_num )
-	{
-		gm_account[i].level = level;
-	}
-	else
-	{
-	    gm_account = (struct gm_account *) aRealloc(gm_account, (GM_num + 1) * sizeof(struct gm_account));
-	    gm_account[GM_num].account_id = account_id;
-	    gm_account[GM_num].level = level;
-	    GM_num++;
-	}
-
-	return 0;
+	return sd->gmlevel;
 }
 
 static int pc_invincible_timer(int tid, unsigned int tick, int id, intptr data)
@@ -709,12 +679,13 @@ int pc_isequip(struct map_session_data *sd,int n)
  * session idに問題無し
  * char鯖から送られてきたステ?タスを設定
  *------------------------------------------*/
-bool pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_time, struct mmo_charstatus *st)
+bool pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_time, int gmlevel, struct mmo_charstatus *st)
 {
 	int i;
 	unsigned long tick = gettick();
 
 	sd->login_id2 = login_id2;
+	sd->gmlevel = gmlevel;
 	memcpy(&sd->status, st, sizeof(*st));
 
 	if (st->sex != sd->status.sex) {
@@ -6925,21 +6896,6 @@ int pc_autosave(int tid, unsigned int tick, int id, intptr data)
 	return 0;
 }
 
-int pc_read_gm_account(int fd)
-{
-	//FIXME: this implementation is a total failure (direct reading from RFIFO) [ultramage]
-	int i = 0;
-	if (gm_account != NULL)
-		aFree(gm_account);
-	GM_num = 0;
-	gm_account = (struct gm_account *) aMallocA(((RFIFOW(fd,2) - 4) / 5)*sizeof(struct gm_account));
-	for (i = 4; i < RFIFOW(fd,2); i += 5) {
-		gm_account[GM_num].account_id = RFIFOL(fd,i);
-		gm_account[GM_num].level = (int)RFIFOB(fd,i+4);
-		GM_num++;
-	}
-	return GM_num;
-}
 static int pc_daynight_timer_sub(struct map_session_data *sd,va_list ap)
 {
 	if (sd->state.night != night_flag && map[sd->bl.m].flag.nightenabled)
@@ -7487,8 +7443,6 @@ int pc_read_motd(void)
  *------------------------------------------*/
 void do_final_pc(void)
 {
-	if (gm_account)
-		aFree(gm_account);
 	return;
 }
 
diff --git a/src/map/pc.h b/src/map/pc.h
index 81a1e9a75..d8dd582c5 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -130,6 +130,7 @@ struct map_session_data {
 	} special_state;
 	int login_id1, login_id2;
 	unsigned short class_;	//This is the internal job ID used by the map server to simplify comparisons/queries/etc. [Skotlex]
+	int gmlevel;
 
 	int packet_ver;  // 5: old, 6: 7july04, 7: 13july04, 8: 26july04, 9: 9aug04/16aug04/17aug04, 10: 6sept04, 11: 21sept04, 12: 18oct04, 13: 25oct04 ... 18
 	struct mmo_charstatus status;
@@ -498,7 +499,7 @@ int pc_setrestartvalue(struct map_session_data *sd,int type);
 int pc_makesavestatus(struct map_session_data *);
 void pc_respawn(struct map_session_data* sd, uint8 clrtype);
 int pc_setnewpc(struct map_session_data*,int,int,int,unsigned int,int,int);
-bool pc_authok(struct map_session_data*, int, time_t, struct mmo_charstatus *);
+bool pc_authok(struct map_session_data* sd, int, time_t, int gmlevel, struct mmo_charstatus* status);
 void pc_authfail(struct map_session_data *);
 int pc_reg_received(struct map_session_data *sd);
 
@@ -655,7 +656,6 @@ struct map_session_data *pc_get_child(struct map_session_data *sd);
 void pc_bleeding (struct map_session_data *sd, unsigned int diff_tick);
 void pc_regen (struct map_session_data *sd, unsigned int diff_tick);
 
-int pc_set_gm_level(int account_id, int level);
 void pc_setstand(struct map_session_data *sd);
 int pc_candrop(struct map_session_data *sd,struct item *item);
 
@@ -685,7 +685,6 @@ struct sg_data {
 };
 extern const struct sg_data sg_info[3];
 
-int pc_read_gm_account(int fd);
 void pc_setinvincibletimer(struct map_session_data* sd, int val);
 void pc_delinvincibletimer(struct map_session_data* sd);
 
diff --git a/src/map/pcre.h b/src/map/pcre.h
deleted file mode 100644
index e973396ba..000000000
--- a/src/map/pcre.h
+++ /dev/null
@@ -1,294 +0,0 @@
-/*************************************************
-*       Perl-Compatible Regular Expressions      *
-*************************************************/
-
-/* This is the public header file for the PCRE library, to be #included by
-applications that call the PCRE functions.
-
-           Copyright (c) 1997-2006 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-#ifndef _PCRE_H
-#define _PCRE_H
-
-/* The current PCRE version information. */
-
-/* NOTES FOR FUTURE MAINTAINERS: Do not use numbers with leading zeros, because
-they may be treated as octal constants. The PCRE_PRERELEASE feature is for
-identifying release candidates. It might be defined as -RC2, for example. In
-real releases, it should be defined empty. Do not change the alignment of these
-statments. The code in ./configure greps out the version numbers by using "cut"
-to get values from column 29 onwards. These are substituted into pcre-config
-and libpcre.pc. The values are not put into configure.ac and substituted here
-(which would simplify this issue) because that makes life harder for those who
-cannot run ./configure. As it now stands, this file need not be edited in that
-circumstance. */
-
-#define PCRE_MAJOR          7
-#define PCRE_MINOR          0
-#define PCRE_PRERELEASE
-#define PCRE_DATE           18-Dec-2006
-
-/* Win32 uses DLL by default; it needs special stuff for exported functions
-when building PCRE. */
-
-#ifdef _WIN32
-#  ifdef PCRE_DEFINITION
-#    ifdef DLL_EXPORT
-#      define PCRE_DATA_SCOPE __declspec(dllexport)
-#    endif
-#  else
-#    ifndef PCRE_STATIC
-#      define PCRE_DATA_SCOPE extern __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
-/* Otherwise, we use the standard "extern". */
-
-#ifndef PCRE_DATA_SCOPE
-#  ifdef __cplusplus
-#    define PCRE_DATA_SCOPE     extern "C"
-#  else
-#    define PCRE_DATA_SCOPE     extern
-#  endif
-#endif
-
-/* Have to include stdlib.h in order to ensure that size_t is defined;
-it is needed here for malloc. */
-
-#include <stdlib.h>
-
-/* Allow for C++ users */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Options */
-
-#define PCRE_CASELESS           0x00000001
-#define PCRE_MULTILINE          0x00000002
-#define PCRE_DOTALL             0x00000004
-#define PCRE_EXTENDED           0x00000008
-#define PCRE_ANCHORED           0x00000010
-#define PCRE_DOLLAR_ENDONLY     0x00000020
-#define PCRE_EXTRA              0x00000040
-#define PCRE_NOTBOL             0x00000080
-#define PCRE_NOTEOL             0x00000100
-#define PCRE_UNGREEDY           0x00000200
-#define PCRE_NOTEMPTY           0x00000400
-#define PCRE_UTF8               0x00000800
-#define PCRE_NO_AUTO_CAPTURE    0x00001000
-#define PCRE_NO_UTF8_CHECK      0x00002000
-#define PCRE_AUTO_CALLOUT       0x00004000
-#define PCRE_PARTIAL            0x00008000
-#define PCRE_DFA_SHORTEST       0x00010000
-#define PCRE_DFA_RESTART        0x00020000
-#define PCRE_FIRSTLINE          0x00040000
-#define PCRE_DUPNAMES           0x00080000
-#define PCRE_NEWLINE_CR         0x00100000
-#define PCRE_NEWLINE_LF         0x00200000
-#define PCRE_NEWLINE_CRLF       0x00300000
-#define PCRE_NEWLINE_ANY        0x00400000
-
-/* Exec-time and get/set-time error codes */
-
-#define PCRE_ERROR_NOMATCH         (-1)
-#define PCRE_ERROR_NULL            (-2)
-#define PCRE_ERROR_BADOPTION       (-3)
-#define PCRE_ERROR_BADMAGIC        (-4)
-#define PCRE_ERROR_UNKNOWN_OPCODE  (-5)
-#define PCRE_ERROR_UNKNOWN_NODE    (-5)  /* For backward compatibility */
-#define PCRE_ERROR_NOMEMORY        (-6)
-#define PCRE_ERROR_NOSUBSTRING     (-7)
-#define PCRE_ERROR_MATCHLIMIT      (-8)
-#define PCRE_ERROR_CALLOUT         (-9)  /* Never used by PCRE itself */
-#define PCRE_ERROR_BADUTF8        (-10)
-#define PCRE_ERROR_BADUTF8_OFFSET (-11)
-#define PCRE_ERROR_PARTIAL        (-12)
-#define PCRE_ERROR_BADPARTIAL     (-13)
-#define PCRE_ERROR_INTERNAL       (-14)
-#define PCRE_ERROR_BADCOUNT       (-15)
-#define PCRE_ERROR_DFA_UITEM      (-16)
-#define PCRE_ERROR_DFA_UCOND      (-17)
-#define PCRE_ERROR_DFA_UMLIMIT    (-18)
-#define PCRE_ERROR_DFA_WSSIZE     (-19)
-#define PCRE_ERROR_DFA_RECURSE    (-20)
-#define PCRE_ERROR_RECURSIONLIMIT (-21)
-#define PCRE_ERROR_NULLWSLIMIT    (-22)
-#define PCRE_ERROR_BADNEWLINE     (-23)
-
-/* Request types for pcre_fullinfo() */
-
-#define PCRE_INFO_OPTIONS            0
-#define PCRE_INFO_SIZE               1
-#define PCRE_INFO_CAPTURECOUNT       2
-#define PCRE_INFO_BACKREFMAX         3
-#define PCRE_INFO_FIRSTBYTE          4
-#define PCRE_INFO_FIRSTCHAR          4  /* For backwards compatibility */
-#define PCRE_INFO_FIRSTTABLE         5
-#define PCRE_INFO_LASTLITERAL        6
-#define PCRE_INFO_NAMEENTRYSIZE      7
-#define PCRE_INFO_NAMECOUNT          8
-#define PCRE_INFO_NAMETABLE          9
-#define PCRE_INFO_STUDYSIZE         10
-#define PCRE_INFO_DEFAULT_TABLES    11
-
-/* Request types for pcre_config(). Do not re-arrange, in order to remain
-compatible. */
-
-#define PCRE_CONFIG_UTF8                    0
-#define PCRE_CONFIG_NEWLINE                 1
-#define PCRE_CONFIG_LINK_SIZE               2
-#define PCRE_CONFIG_POSIX_MALLOC_THRESHOLD  3
-#define PCRE_CONFIG_MATCH_LIMIT             4
-#define PCRE_CONFIG_STACKRECURSE            5
-#define PCRE_CONFIG_UNICODE_PROPERTIES      6
-#define PCRE_CONFIG_MATCH_LIMIT_RECURSION   7
-
-/* Bit flags for the pcre_extra structure. Do not re-arrange or redefine
-these bits, just add new ones on the end, in order to remain compatible. */
-
-#define PCRE_EXTRA_STUDY_DATA             0x0001
-#define PCRE_EXTRA_MATCH_LIMIT            0x0002
-#define PCRE_EXTRA_CALLOUT_DATA           0x0004
-#define PCRE_EXTRA_TABLES                 0x0008
-#define PCRE_EXTRA_MATCH_LIMIT_RECURSION  0x0010
-
-/* Types */
-
-struct real_pcre;                 /* declaration; the definition is private  */
-typedef struct real_pcre pcre;
-
-/* When PCRE is compiled as a C++ library, the subject pointer type can be
-replaced with a custom type. For conventional use, the public interface is a
-const char *. */
-
-#ifndef PCRE_SPTR
-#define PCRE_SPTR const char *
-#endif
-
-/* The structure for passing additional data to pcre_exec(). This is defined in
-such as way as to be extensible. Always add new fields at the end, in order to
-remain compatible. */
-
-typedef struct pcre_extra {
-  unsigned long int flags;        /* Bits for which fields are set */
-  void *study_data;               /* Opaque data from pcre_study() */
-  unsigned long int match_limit;  /* Maximum number of calls to match() */
-  void *callout_data;             /* Data passed back in callouts */
-  const unsigned char *tables;    /* Pointer to character tables */
-  unsigned long int match_limit_recursion; /* Max recursive calls to match() */
-} pcre_extra;
-
-/* The structure for passing out data via the pcre_callout_function. We use a
-structure so that new fields can be added on the end in future versions,
-without changing the API of the function, thereby allowing old clients to work
-without modification. */
-
-typedef struct pcre_callout_block {
-  int          version;           /* Identifies version of block */
-  /* ------------------------ Version 0 ------------------------------- */
-  int          callout_number;    /* Number compiled into pattern */
-  int         *offset_vector;     /* The offset vector */
-  PCRE_SPTR    subject;           /* The subject being matched */
-  int          subject_length;    /* The length of the subject */
-  int          start_match;       /* Offset to start of this match attempt */
-  int          current_position;  /* Where we currently are in the subject */
-  int          capture_top;       /* Max current capture */
-  int          capture_last;      /* Most recently closed capture */
-  void        *callout_data;      /* Data passed in with the call */
-  /* ------------------- Added for Version 1 -------------------------- */
-  int          pattern_position;  /* Offset to next item in the pattern */
-  int          next_item_length;  /* Length of next item in the pattern */
-  /* ------------------------------------------------------------------ */
-} pcre_callout_block;
-
-/* Indirection for store get and free functions. These can be set to
-alternative malloc/free functions if required. Special ones are used in the
-non-recursive case for "frames". There is also an optional callout function
-that is triggered by the (?) regex item. For Virtual Pascal, these definitions
-have to take another form. */
-
-#ifndef VPCOMPAT
-PCRE_DATA_SCOPE void *(*pcre_malloc)(size_t);
-PCRE_DATA_SCOPE void  (*pcre_free)(void *);
-PCRE_DATA_SCOPE void *(*pcre_stack_malloc)(size_t);
-PCRE_DATA_SCOPE void  (*pcre_stack_free)(void *);
-PCRE_DATA_SCOPE int   (*pcre_callout)(pcre_callout_block *);
-#else   /* VPCOMPAT */
-PCRE_DATA_SCOPE void *pcre_malloc(size_t);
-PCRE_DATA_SCOPE void  pcre_free(void *);
-PCRE_DATA_SCOPE void *pcre_stack_malloc(size_t);
-PCRE_DATA_SCOPE void  pcre_stack_free(void *);
-PCRE_DATA_SCOPE int   pcre_callout(pcre_callout_block *);
-#endif  /* VPCOMPAT */
-
-/* Exported PCRE functions */
-
-PCRE_DATA_SCOPE pcre *pcre_compile(const char *, int, const char **, int *,
-                  const unsigned char *);
-PCRE_DATA_SCOPE pcre *pcre_compile2(const char *, int, int *, const char **,
-                  int *, const unsigned char *);
-PCRE_DATA_SCOPE int  pcre_config(int, void *);
-PCRE_DATA_SCOPE int  pcre_copy_named_substring(const pcre *, const char *,
-                  int *, int, const char *, char *, int);
-PCRE_DATA_SCOPE int  pcre_copy_substring(const char *, int *, int, int, char *,
-                  int);
-PCRE_DATA_SCOPE int  pcre_dfa_exec(const pcre *, const pcre_extra *,
-                  const char *, int, int, int, int *, int , int *, int);
-PCRE_DATA_SCOPE int  pcre_exec(const pcre *, const pcre_extra *, PCRE_SPTR,
-                   int, int, int, int *, int);
-PCRE_DATA_SCOPE void pcre_free_substring(const char *);
-PCRE_DATA_SCOPE void pcre_free_substring_list(const char **);
-PCRE_DATA_SCOPE int  pcre_fullinfo(const pcre *, const pcre_extra *, int,
-                  void *);
-PCRE_DATA_SCOPE int  pcre_get_named_substring(const pcre *, const char *,
-                  int *, int, const char *, const char **);
-PCRE_DATA_SCOPE int  pcre_get_stringnumber(const pcre *, const char *);
-PCRE_DATA_SCOPE int  pcre_get_stringtable_entries(const pcre *, const char *,
-                  char **, char **);
-PCRE_DATA_SCOPE int  pcre_get_substring(const char *, int *, int, int,
-                  const char **);
-PCRE_DATA_SCOPE int  pcre_get_substring_list(const char *, int *, int,
-                  const char ***);
-PCRE_DATA_SCOPE int  pcre_info(const pcre *, int *, int *);
-PCRE_DATA_SCOPE const unsigned char *pcre_maketables(void);
-PCRE_DATA_SCOPE int  pcre_refcount(pcre *, int);
-PCRE_DATA_SCOPE pcre_extra *pcre_study(const pcre *, int, const char **);
-PCRE_DATA_SCOPE const char *pcre_version(void);
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#endif /* End of pcre.h */
diff --git a/src/map/trade.c b/src/map/trade.c
index 880657ff0..aca08872a 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -70,7 +70,7 @@ void trade_traderequest(struct map_session_data *sd, struct map_session_data *ta
 	} 
 	
 	//Fixed. Only real GMs can request trade from far away! [Lupus] 
-	if (level < lowest_gm_level && (sd->bl.m != target_sd->bl.m ||
+	if (level < battle_config.lowest_gm_level && (sd->bl.m != target_sd->bl.m ||
 		!check_distance_bl(&sd->bl, &target_sd->bl, TRADE_DISTANCE)
 	)) {
 		clif_tradestart(sd, 0); // too far
@@ -127,7 +127,7 @@ void trade_tradeack(struct map_session_data *sd, int type)
 		return; //If client didn't send accept, it's a broken packet?
 
 	//Copied here as well since the original character could had warped.
-	if (pc_isGM(tsd) < lowest_gm_level && (sd->bl.m != tsd->bl.m ||
+	if (pc_isGM(tsd) < battle_config.lowest_gm_level && (sd->bl.m != tsd->bl.m ||
 		!check_distance_bl(&sd->bl, &tsd->bl, TRADE_DISTANCE)
 	)) {
 		clif_tradestart(sd, 0); // too far
diff --git a/src/mysql/config-win.h b/src/mysql/config-win.h
deleted file mode 100644
index b2e1c9831..000000000
--- a/src/mysql/config-win.h
+++ /dev/null
@@ -1,470 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/* Defines for Win32 to make it compatible for MySQL */
-
-#ifdef __WIN2000__
-/* We have to do this define before including windows.h to get the AWE API
-functions */
-#define _WIN32_WINNT     0x0500
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-/* Avoid endless warnings about sprintf() etc. being unsafe. */
-#define _CRT_SECURE_NO_DEPRECATE 1
-#endif
-
-#include <sys/locking.h>
-#include <windows.h>
-#include <math.h>			/* Because of rint() */
-#include <fcntl.h>
-#include <io.h>
-#include <malloc.h>
-
-#define HAVE_SMEM 1
-
-#if defined(_WIN64) || defined(WIN64) 
-#define SYSTEM_TYPE	"Win64" 
-#elif defined(_WIN32) || defined(WIN32) 
-#define SYSTEM_TYPE	"Win32" 
-#else
-#define SYSTEM_TYPE	"Windows"
-#endif
-
-#if defined(_M_IA64) 
-#define MACHINE_TYPE	"ia64" 
-#elif defined(_M_IX86) 
-#define MACHINE_TYPE	"ia32" 
-#elif defined(_M_ALPHA) 
-#define MACHINE_TYPE	"axp" 
-#else
-#define MACHINE_TYPE	"unknown"	/* Define to machine type name */
-#endif 
- 
-#if !(defined(_WIN64) || defined(WIN64)) 
-#ifndef _WIN32
-#define _WIN32				/* Compatible with old source */
-#endif
-#ifndef __WIN32__
-#define __WIN32__
-#endif
-#endif /* _WIN64 */
-#ifndef __WIN__
-#define __WIN__			      /* To make it easier in VC++ */
-#endif
-
-#ifndef MAX_INDEXES
-#define MAX_INDEXES 64
-#endif
-
-/* File and lock constants */
-#define O_SHARE		0x1000		/* Open file in sharing mode */
-#ifdef __BORLANDC__
-#define F_RDLCK		LK_NBLCK	/* read lock */
-#define F_WRLCK		LK_NBRLCK	/* write lock */
-#define F_UNLCK		LK_UNLCK	/* remove lock(s) */
-#else
-#define F_RDLCK		_LK_NBLCK	/* read lock */
-#define F_WRLCK		_LK_NBRLCK	/* write lock */
-#define F_UNLCK		_LK_UNLCK	/* remove lock(s) */
-#endif
-
-#define F_EXCLUSIVE	1		/* We have only exclusive locking */
-#define F_TO_EOF	(INT_MAX32/2)	/* size for lock of all file */
-#define F_OK		0		/* parameter to access() */
-#define W_OK		2
-
-#define S_IROTH		S_IREAD		/* for my_lib */
-
-#ifdef __BORLANDC__
-#define FILE_BINARY	O_BINARY	/* my_fopen in binary mode */
-#define O_TEMPORARY	0
-#define O_SHORT_LIVED	0
-#define SH_DENYNO	_SH_DENYNO
-#else
-#define O_BINARY	_O_BINARY	/* compability with MSDOS */
-#define FILE_BINARY	_O_BINARY	/* my_fopen in binary mode */
-#define O_TEMPORARY	_O_TEMPORARY
-#define O_SHORT_LIVED	_O_SHORT_LIVED
-#define SH_DENYNO	_SH_DENYNO
-#endif
-#define NO_OPEN_3			/* For my_create() */
-
-#define SIGQUIT		SIGTERM		/* No SIGQUIT */
-
-#undef _REENTRANT			/* Crashes something for win32 */
-#undef SAFE_MUTEX			/* Can't be used on windows */
-
-#if defined(_MSC_VER) && _MSC_VER >= 1310
-#define LL(A)           A##ll
-#define ULL(A)          A##ull
-#else
-#define LL(A)           ((__int64) A)
-#define ULL(A)          ((unsigned __int64) A)
-#endif
-
-#define LONGLONG_MIN	LL(0x8000000000000000)
-#define LONGLONG_MAX	LL(0x7FFFFFFFFFFFFFFF)
-#define ULONGLONG_MAX	ULL(0xFFFFFFFFFFFFFFFF)
-
-/* Type information */
-
-#if defined(__EMX__) || !defined(HAVE_UINT)
-#undef HAVE_UINT
-#define HAVE_UINT
-typedef unsigned short	ushort;
-typedef unsigned int	uint;
-#endif /* defined(__EMX__) || !defined(HAVE_UINT) */
-
-typedef unsigned __int64 ulonglong;	/* Microsofts 64 bit types */
-typedef __int64 longlong;
-#ifndef HAVE_SIGSET_T
-typedef int sigset_t;
-#endif
-#define longlong_defined
-/*
-  off_t should not be __int64 because of conflicts in header files;
-  Use my_off_t or os_off_t instead
-*/
-#ifndef HAVE_OFF_T
-typedef long off_t;
-#endif
-typedef __int64 os_off_t;
-#ifdef _WIN64
-typedef UINT_PTR rf_SetTimer;
-#else
-#ifndef HAVE_SIZE_T
-typedef unsigned int size_t;
-#endif
-typedef uint rf_SetTimer;
-#endif
-
-#define Socket_defined
-#define my_socket SOCKET
-#define bool BOOL
-#define SIGPIPE SIGINT
-#define RETQSORTTYPE void
-#define QSORT_TYPE_IS_VOID
-#define RETSIGTYPE void
-#define SOCKET_SIZE_TYPE int
-#define my_socket_defined
-#define bool_defined
-#define byte_defined
-#define HUGE_PTR
-#define STDCALL __stdcall	    /* Used by libmysql.dll */
-#define isnan(X) _isnan(X)
-#define finite(X) _finite(X)
-
-#ifndef UNDEF_THREAD_HACK
-#define THREAD
-#endif
-#define VOID_SIGHANDLER
-#define SIZEOF_CHAR		1
-#define SIZEOF_LONG		4
-#define SIZEOF_LONG_LONG	8
-#define SIZEOF_OFF_T		8
-#ifdef _WIN64
-#define SIZEOF_CHARP		8
-#else
-#define SIZEOF_CHARP		4
-#endif
-#define HAVE_BROKEN_NETINET_INCLUDES
-#ifdef __NT__
-#define HAVE_NAMED_PIPE			/* We can only create pipes on NT */
-#endif
-
-/* ERROR is defined in wingdi.h */
-#undef ERROR
-
-/* We need to close files to break connections on shutdown */
-#ifndef SIGNAL_WITH_VIO_CLOSE
-#define SIGNAL_WITH_VIO_CLOSE
-#endif
-
-/* Use all character sets in MySQL */
-#define USE_MB 1
-#define USE_MB_IDENT 1
-#define USE_STRCOLL 1
-
-/* All windows servers should support .sym files */
-#undef USE_SYMDIR
-#define USE_SYMDIR
-
-/* If LOAD DATA LOCAL INFILE should be enabled by default */
-#define ENABLED_LOCAL_INFILE 1
-
-/* Convert some simple functions to Posix */
-
-#define my_sigset(A,B) signal((A),(B))
-#define finite(A) _finite(A)
-#define sleep(A)  Sleep((A)*1000)
-#define popen(A,B) _popen((A),(B))
-#define pclose(A) _pclose(A)
-
-#ifndef __BORLANDC__
-#define access(A,B) _access(A,B)
-#endif
-
-#if !defined(__cplusplus)
-#define inline __inline
-#endif /* __cplusplus */
-
-inline double rint(double nr)
-{
-  double f = floor(nr);
-  double c = ceil(nr);
-  return (((c-nr) >= (nr-f)) ? f :c);
-}
-
-#ifdef _WIN64
-#define ulonglong2double(A) ((double) (ulonglong) (A))
-#define my_off_t2double(A)  ((double) (my_off_t) (A))
-
-#else
-inline double ulonglong2double(ulonglong value)
-{
-  longlong nr=(longlong) value;
-  if (nr >= 0)
-    return (double) nr;
-  return (18446744073709551616.0 + (double) nr);
-}
-#define my_off_t2double(A) ulonglong2double(A)
-#endif /* _WIN64 */
-
-#if SIZEOF_OFF_T > 4
-#define lseek(A,B,C) _lseeki64((A),(longlong) (B),(C))
-#define tell(A) _telli64(A)
-#endif
-
-#define set_timespec(ABSTIME,SEC) { (ABSTIME).tv_sec=time((time_t*)0) + (time_t) (SEC); (ABSTIME).tv_nsec=0; }
-
-#define STACK_DIRECTION -1
-
-/* Optimized store functions for Intel x86 */
-
-#ifndef _WIN64
-#define sint2korr(A)	(*((int16 *) (A)))
-#define sint3korr(A)	((int32) ((((uchar) (A)[2]) & 128) ? \
-				  (((uint32) 255L << 24) | \
-				   (((uint32) (uchar) (A)[2]) << 16) |\
-				   (((uint32) (uchar) (A)[1]) << 8) | \
-				   ((uint32) (uchar) (A)[0])) : \
-				  (((uint32) (uchar) (A)[2]) << 16) |\
-				  (((uint32) (uchar) (A)[1]) << 8) | \
-				  ((uint32) (uchar) (A)[0])))
-#define sint4korr(A)	(*((long *) (A)))
-#define uint2korr(A)	(*((uint16 *) (A)))
-/*
-   ATTENTION !
-   
-    Please, note, uint3korr reads 4 bytes (not 3) !
-    It means, that you have to provide enough allocated space !
-*/
-#define uint3korr(A)	(long) (*((unsigned int *) (A)) & 0xFFFFFF)
-#define uint4korr(A)	(*((unsigned long *) (A)))
-#define uint5korr(A)	((ulonglong)(((uint32) ((uchar) (A)[0])) +\
-				    (((uint32) ((uchar) (A)[1])) << 8) +\
-				    (((uint32) ((uchar) (A)[2])) << 16) +\
-				    (((uint32) ((uchar) (A)[3])) << 24)) +\
-				    (((ulonglong) ((uchar) (A)[4])) << 32))
-#define uint8korr(A)	(*((ulonglong *) (A)))
-#define sint8korr(A)	(*((longlong *) (A)))
-#define int2store(T,A)	*((uint16*) (T))= (uint16) (A)
-#define int3store(T,A)		{ *(T)=  (uchar) ((A));\
-				  *(T+1)=(uchar) (((uint) (A) >> 8));\
-				  *(T+2)=(uchar) (((A) >> 16)); }
-#define int4store(T,A)	*((long *) (T))= (long) (A)
-#define int5store(T,A)	{ *(T)= (uchar)((A));\
-			  *((T)+1)=(uchar) (((A) >> 8));\
-			  *((T)+2)=(uchar) (((A) >> 16));\
-			  *((T)+3)=(uchar) (((A) >> 24)); \
-			  *((T)+4)=(uchar) (((A) >> 32)); }
-#define int8store(T,A)	*((ulonglong *) (T))= (ulonglong) (A)
-
-#define doubleget(V,M)	do { *((long *) &V) = *((long*) M); \
-			    *(((long *) &V)+1) = *(((long*) M)+1); } while(0)
-#define doublestore(T,V) do { *((long *) T) = *((long*) &V); \
-			      *(((long *) T)+1) = *(((long*) &V)+1); } while(0)
-#define float4get(V,M) { *((long *) &(V)) = *((long*) (M)); }
-#define floatstore(T,V) memcpy((byte*)(T), (byte*)(&V), sizeof(float))
-#define floatget(V,M)   memcpy((byte*)(&V), (byte*)(M), sizeof(float))
-#define float8get(V,M) doubleget((V),(M))
-#define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float))
-#define float8store(V,M) doublestore((V),(M))
-#endif /* _WIN64 */
-
-#define HAVE_PERROR
-#define HAVE_VFPRINT
-#define HAVE_RENAME		/* Have rename() as function */
-#define HAVE_BINARY_STREAMS	/* Have "b" flag in streams */
-#define HAVE_LONG_JMP		/* Have long jump function */
-#define HAVE_LOCKING		/* have locking() call */
-#define HAVE_ERRNO_AS_DEFINE	/* errno is a define */
-#define HAVE_STDLIB		/* everything is include in this file */
-#define HAVE_MEMCPY
-#define HAVE_MEMMOVE
-#define HAVE_GETCWD
-#define HAVE_TELL
-#define HAVE_TZNAME
-#define HAVE_PUTENV
-#define HAVE_SELECT
-#define HAVE_SETLOCALE
-#define HAVE_SOCKET		/* Giangi */
-#define HAVE_FLOAT_H
-#define HAVE_LIMITS_H
-#define HAVE_STDDEF_H
-#define HAVE_RINT		/* defined in this file */
-#define NO_FCNTL_NONBLOCK	/* No FCNTL */
-#define HAVE_ALLOCA
-#define HAVE_STRPBRK
-#define HAVE_STRSTR
-#define HAVE_COMPRESS
-#define HAVE_CREATESEMAPHORE
-#define HAVE_ISNAN
-#define HAVE_FINITE
-#define HAVE_QUERY_CACHE
-#define SPRINTF_RETURNS_INT
-#define HAVE_SETFILEPOINTER
-#define HAVE_VIO_READ_BUFF
-#define HAVE_STRNLEN
-
-#ifndef __NT__
-#undef FILE_SHARE_DELETE
-#define FILE_SHARE_DELETE 0     /* Not implemented on Win 98/ME */
-#endif
-
-#ifdef NOT_USED
-#define HAVE_SNPRINTF		/* Gave link error */
-#define _snprintf snprintf
-#endif
-
-#ifdef _MSC_VER
-#define HAVE_LDIV		/* The optimizer breaks in zortech for ldiv */
-#define HAVE_ANSI_INCLUDE
-#define HAVE_SYS_UTIME_H
-#define HAVE_STRTOUL
-#endif
-#define my_reinterpret_cast(A) reinterpret_cast <A>
-#define my_const_cast(A) const_cast<A>
-
-
-/* MYSQL OPTIONS */
-
-#ifdef _CUSTOMCONFIG_
-#include <custom_conf.h>
-#else
-#define DEFAULT_MYSQL_HOME	"c:\\mysql"
-#define PACKAGE			"mysql"
-#define DEFAULT_BASEDIR		"C:\\"
-#define SHAREDIR		"share"
-#define DEFAULT_CHARSET_HOME	"C:/mysql/"
-#endif
-#ifndef DEFAULT_HOME_ENV
-#define DEFAULT_HOME_ENV MYSQL_HOME
-#endif
-#ifndef DEFAULT_GROUP_SUFFIX_ENV
-#define DEFAULT_GROUP_SUFFIX_ENV MYSQL_GROUP_SUFFIX
-#endif
-
-/* File name handling */
-
-#define FN_LIBCHAR	'\\'
-#define FN_ROOTDIR	"\\"
-#define FN_NETWORK_DRIVES	/* Uses \\ to indicate network drives */
-#define FN_NO_CASE_SENCE	/* Files are not case-sensitive */
-#define OS_FILE_LIMIT	2048
-
-#define DO_NOT_REMOVE_THREAD_WRAPPERS
-#define thread_safe_increment(V,L) InterlockedIncrement((long*) &(V))
-#define thread_safe_decrement(V,L) InterlockedDecrement((long*) &(V))
-/* The following is only used for statistics, so it should be good enough */
-#ifdef __NT__  /* This should also work on Win98 but .. */
-#define thread_safe_add(V,C,L) InterlockedExchangeAdd((long*) &(V),(C))
-#define thread_safe_sub(V,C,L) InterlockedExchangeAdd((long*) &(V),-(long) (C))
-#define statistic_add(V,C,L) thread_safe_add((V),(C),(L))
-#else
-#define thread_safe_add(V,C,L) \
-	pthread_mutex_lock((L)); (V)+=(C); pthread_mutex_unlock((L));
-#define thread_safe_sub(V,C,L) \
-	pthread_mutex_lock((L)); (V)-=(C); pthread_mutex_unlock((L));
-#define statistic_add(V,C,L)	 (V)+=(C)
-#endif
-#define statistic_increment(V,L) thread_safe_increment((V),(L))
-#define statistic_decrement(V,L) thread_safe_decrement((V),(L))
-
-#define shared_memory_buffer_length 16000
-#define default_shared_memory_base_name "MYSQL"
-
-#ifdef CYBOZU
-#define MYSQL_DEFAULT_CHARSET_NAME "utf8"
-#define MYSQL_DEFAULT_COLLATION_NAME "utf8_general_cs"
-#define HAVE_UTF8_GENERAL_CS 1
-#else
-#define MYSQL_DEFAULT_CHARSET_NAME "latin1"
-#define MYSQL_DEFAULT_COLLATION_NAME "latin1_swedish_ci"
-#endif
-
-#define HAVE_SPATIAL 1
-#define HAVE_RTREE_KEYS 1
-
-#define HAVE_OPENSSL 1
-#define HAVE_YASSL 1
-
-/* Define charsets you want */
-/* #undef HAVE_CHARSET_armscii8 */
-/* #undef HAVE_CHARSET_ascii */
-#ifndef CYBOZU
-#define HAVE_CHARSET_big5 1
-#define HAVE_CHARSET_cp1250 1
-#endif
-/* #undef HAVE_CHARSET_cp1251 */
-/* #undef HAVE_CHARSET_cp1256 */
-/* #undef HAVE_CHARSET_cp1257 */
-/* #undef HAVE_CHARSET_cp850 */
-/* #undef HAVE_CHARSET_cp852 */
-/* #undef HAVE_CHARSET_cp866 */
-#define HAVE_CHARSET_cp932 1
-/* #undef HAVE_CHARSET_dec8 */
-#ifndef CYBOZU
-#define HAVE_CHARSET_eucjpms 1
-#define HAVE_CHARSET_euckr 1
-#define HAVE_CHARSET_gb2312 1
-#define HAVE_CHARSET_gbk 1
-#endif
-/* #undef HAVE_CHARSET_greek */
-/* #undef HAVE_CHARSET_hebrew */
-/* #undef HAVE_CHARSET_hp8 */
-/* #undef HAVE_CHARSET_keybcs2 */
-/* #undef HAVE_CHARSET_koi8r */
-/* #undef HAVE_CHARSET_koi8u */
-#ifndef CYBOZU
-#define HAVE_CHARSET_latin1 1
-#define HAVE_CHARSET_latin2 1
-#endif
-/* #undef HAVE_CHARSET_latin5 */
-/* #undef HAVE_CHARSET_latin7 */
-/* #undef HAVE_CHARSET_macce */
-/* #undef HAVE_CHARSET_macroman */
-#define HAVE_CHARSET_sjis 1
-/* #undef HAVE_CHARSET_swe7 */
-#ifndef CYBOZU
-#define HAVE_CHARSET_tis620 1
-#define HAVE_CHARSET_ucs2 1
-#define HAVE_CHARSET_ujis 1
-#endif
-#define HAVE_CHARSET_utf8 1
-#define HAVE_UCA_COLLATIONS 1
-
diff --git a/src/mysql/m_ctype.h b/src/mysql/m_ctype.h
deleted file mode 100644
index 54ae41bf2..000000000
--- a/src/mysql/m_ctype.h
+++ /dev/null
@@ -1,493 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/*
-  A better inplementation of the UNIX ctype(3) library.
-  Notes:   my_global.h should be included before ctype.h
-*/
-
-#ifndef _m_ctype_h
-#define _m_ctype_h
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-#define MY_CS_NAME_SIZE			32
-#define MY_CS_CTYPE_TABLE_SIZE		257
-#define MY_CS_TO_LOWER_TABLE_SIZE	256
-#define MY_CS_TO_UPPER_TABLE_SIZE	256
-#define MY_CS_SORT_ORDER_TABLE_SIZE	256
-#define MY_CS_TO_UNI_TABLE_SIZE		256
-
-#define CHARSET_DIR	"charsets/"
-
-#define my_wc_t ulong
-
-typedef struct unicase_info_st
-{
-  uint16 toupper;
-  uint16 tolower;
-  uint16 sort;
-} MY_UNICASE_INFO;
-
-
-extern MY_UNICASE_INFO *my_unicase_default[256];
-extern MY_UNICASE_INFO *my_unicase_turkish[256];
-
-
-/* wm_wc and wc_mb return codes */
-#define MY_CS_ILSEQ	0     /* Wrong by sequence: wb_wc                   */
-#define MY_CS_ILUNI	0     /* Cannot encode Unicode to charset: wc_mb    */
-#define MY_CS_TOOSMALL  -101  /* Need at least one byte:    wc_mb and mb_wc */
-#define MY_CS_TOOSMALL2 -102  /* Need at least two bytes:   wc_mb and mb_wc */
-#define MY_CS_TOOSMALL3 -103  /* Need at least three bytes: wc_mb and mb_wc */
-/* These following three are currently not really used */
-#define MY_CS_TOOSMALL4 -104  /* Need at least 4 bytes: wc_mb and mb_wc */
-#define MY_CS_TOOSMALL5 -105  /* Need at least 5 bytes: wc_mb and mb_wc */
-#define MY_CS_TOOSMALL6 -106  /* Need at least 6 bytes: wc_mb and mb_wc */
-/* A helper macros for "need at least n bytes" */
-#define MY_CS_TOOSMALLN(n)    (-100-(n))
-
-#define MY_SEQ_INTTAIL	1
-#define MY_SEQ_SPACES	2
-
-        /* My charsets_list flags */
-#define MY_CS_COMPILED  1      /* compiled-in sets               */
-#define MY_CS_CONFIG    2      /* sets that have a *.conf file   */
-#define MY_CS_INDEX     4      /* sets listed in the Index file  */
-#define MY_CS_LOADED    8      /* sets that are currently loaded */
-#define MY_CS_BINSORT	16     /* if binary sort order           */
-#define MY_CS_PRIMARY	32     /* if primary collation           */
-#define MY_CS_STRNXFRM	64     /* if strnxfrm is used for sort   */
-#define MY_CS_UNICODE	128    /* is a charset is full unicode   */
-#define MY_CS_READY	256    /* if a charset is initialized    */
-#define MY_CS_AVAILABLE	512    /* If either compiled-in or loaded*/
-#define MY_CS_CSSORT	1024   /* if case sensitive sort order   */	
-#define MY_CHARSET_UNDEFINED 0
-
-
-typedef struct my_uni_idx_st
-{
-  uint16 from;
-  uint16 to;
-  uchar  *tab;
-} MY_UNI_IDX;
-
-typedef struct
-{
-  uint beg;
-  uint end;
-  uint mblen;
-} my_match_t;
-
-enum my_lex_states
-{
-  MY_LEX_START, MY_LEX_CHAR, MY_LEX_IDENT, 
-  MY_LEX_IDENT_SEP, MY_LEX_IDENT_START,
-  MY_LEX_REAL, MY_LEX_HEX_NUMBER, MY_LEX_BIN_NUMBER,
-  MY_LEX_CMP_OP, MY_LEX_LONG_CMP_OP, MY_LEX_STRING, MY_LEX_COMMENT, MY_LEX_END,
-  MY_LEX_OPERATOR_OR_IDENT, MY_LEX_NUMBER_IDENT, MY_LEX_INT_OR_REAL,
-  MY_LEX_REAL_OR_POINT, MY_LEX_BOOL, MY_LEX_EOL, MY_LEX_ESCAPE, 
-  MY_LEX_LONG_COMMENT, MY_LEX_END_LONG_COMMENT, MY_LEX_SEMICOLON, 
-  MY_LEX_SET_VAR, MY_LEX_USER_END, MY_LEX_HOSTNAME, MY_LEX_SKIP, 
-  MY_LEX_USER_VARIABLE_DELIMITER, MY_LEX_SYSTEM_VAR,
-  MY_LEX_IDENT_OR_KEYWORD,
-  MY_LEX_IDENT_OR_HEX, MY_LEX_IDENT_OR_BIN, MY_LEX_IDENT_OR_NCHAR,
-  MY_LEX_STRING_OR_DELIMITER
-};
-
-struct charset_info_st;
-
-typedef struct my_collation_handler_st
-{
-  my_bool (*init)(struct charset_info_st *, void *(*alloc)(uint));
-  /* Collation routines */
-  int     (*strnncoll)(struct charset_info_st *,
-		       const uchar *, uint, const uchar *, uint, my_bool);
-  int     (*strnncollsp)(struct charset_info_st *,
-                         const uchar *, uint, const uchar *, uint,
-                         my_bool diff_if_only_endspace_difference);
-  int     (*strnxfrm)(struct charset_info_st *,
-		      uchar *, uint, const uchar *, uint);
-  uint    (*strnxfrmlen)(struct charset_info_st *, uint); 
-  my_bool (*like_range)(struct charset_info_st *,
-			const char *s, uint s_length,
-			pchar w_prefix, pchar w_one, pchar w_many, 
-			uint res_length,
-			char *min_str, char *max_str,
-			uint *min_len, uint *max_len);
-  int     (*wildcmp)(struct charset_info_st *,
-  		     const char *str,const char *str_end,
-                     const char *wildstr,const char *wildend,
-                     int escape,int w_one, int w_many);
-
-  int  (*strcasecmp)(struct charset_info_st *, const char *, const char *);
-  
-  uint (*instr)(struct charset_info_st *,
-                const char *b, uint b_length,
-                const char *s, uint s_length,
-                my_match_t *match, uint nmatch);
-  
-  /* Hash calculation */
-  void (*hash_sort)(struct charset_info_st *cs, const uchar *key, uint len,
-		    ulong *nr1, ulong *nr2); 
-  my_bool (*propagate)(struct charset_info_st *cs, const uchar *str, uint len);
-} MY_COLLATION_HANDLER;
-
-extern MY_COLLATION_HANDLER my_collation_mb_bin_handler;
-extern MY_COLLATION_HANDLER my_collation_8bit_bin_handler;
-extern MY_COLLATION_HANDLER my_collation_8bit_simple_ci_handler;
-extern MY_COLLATION_HANDLER my_collation_ucs2_uca_handler;
-
-
-typedef struct my_charset_handler_st
-{
-  my_bool (*init)(struct charset_info_st *, void *(*alloc)(uint));
-  /* Multibyte routines */
-  int     (*ismbchar)(struct charset_info_st *, const char *, const char *);
-  int     (*mbcharlen)(struct charset_info_st *, uint);
-  uint    (*numchars)(struct charset_info_st *, const char *b, const char *e);
-  uint    (*charpos)(struct charset_info_st *, const char *b, const char *e, uint pos);
-  uint    (*well_formed_len)(struct charset_info_st *,
-                             const char *b,const char *e,
-                             uint nchars, int *error);
-  uint    (*lengthsp)(struct charset_info_st *, const char *ptr, uint length);
-  uint    (*numcells)(struct charset_info_st *, const char *b, const char *e);
-  
-  /* Unicode convertion */
-  int (*mb_wc)(struct charset_info_st *cs,my_wc_t *wc,
-	       const unsigned char *s,const unsigned char *e);
-  int (*wc_mb)(struct charset_info_st *cs,my_wc_t wc,
-	       unsigned char *s,unsigned char *e);
-  
-  /* Functions for case and sort convertion */
-  void    (*caseup_str)(struct charset_info_st *, char *);
-  void    (*casedn_str)(struct charset_info_st *, char *);
-  uint    (*caseup)(struct charset_info_st *, char *src, uint srclen,
-                                              char *dst, uint dstlen);
-  uint    (*casedn)(struct charset_info_st *, char *src, uint srclen,
-                                              char *dst, uint dstlen);
-  
-  /* Charset dependant snprintf() */
-  int  (*snprintf)(struct charset_info_st *, char *to, uint n, const char *fmt,
-		   ...);
-  int  (*long10_to_str)(struct charset_info_st *, char *to, uint n, int radix,
-			long int val);
-  int (*longlong10_to_str)(struct charset_info_st *, char *to, uint n,
-			   int radix, longlong val);
-  
-  void (*fill)(struct charset_info_st *, char *to, uint len, int fill);
-  
-  /* String-to-number convertion routines */
-  long        (*strntol)(struct charset_info_st *, const char *s, uint l,
-			 int base, char **e, int *err);
-  ulong      (*strntoul)(struct charset_info_st *, const char *s, uint l,
-			 int base, char **e, int *err);
-  longlong   (*strntoll)(struct charset_info_st *, const char *s, uint l,
-			 int base, char **e, int *err);
-  ulonglong (*strntoull)(struct charset_info_st *, const char *s, uint l,
-			 int base, char **e, int *err);
-  double      (*strntod)(struct charset_info_st *, char *s, uint l, char **e,
-			 int *err);
-  longlong    (*strtoll10)(struct charset_info_st *cs,
-                           const char *nptr, char **endptr, int *error);
-  ulong        (*scan)(struct charset_info_st *, const char *b, const char *e,
-		       int sq);
-} MY_CHARSET_HANDLER;
-
-extern MY_CHARSET_HANDLER my_charset_8bit_handler;
-extern MY_CHARSET_HANDLER my_charset_ucs2_handler;
-
-
-typedef struct charset_info_st
-{
-  uint      number;
-  uint      primary_number;
-  uint      binary_number;
-  uint      state;
-  const char *csname;
-  const char *name;
-  const char *comment;
-  const char *tailoring;
-  uchar    *ctype;
-  uchar    *to_lower;
-  uchar    *to_upper;
-  uchar    *sort_order;
-  uint16   *contractions;
-  uint16   **sort_order_big;
-  uint16      *tab_to_uni;
-  MY_UNI_IDX  *tab_from_uni;
-  MY_UNICASE_INFO **caseinfo;
-  uchar     *state_map;
-  uchar     *ident_map;
-  uint      strxfrm_multiply;
-  uchar     caseup_multiply;
-  uchar     casedn_multiply;
-  uint      mbminlen;
-  uint      mbmaxlen;
-  uint16    min_sort_char;
-  uint16    max_sort_char; /* For LIKE optimization */
-  uchar     pad_char;
-  my_bool   escape_with_backslash_is_dangerous;
-  
-  MY_CHARSET_HANDLER *cset;
-  MY_COLLATION_HANDLER *coll;
-  
-} CHARSET_INFO;
-
-
-extern CHARSET_INFO my_charset_bin;
-extern CHARSET_INFO my_charset_big5_chinese_ci;
-extern CHARSET_INFO my_charset_big5_bin;
-extern CHARSET_INFO my_charset_cp932_japanese_ci;
-extern CHARSET_INFO my_charset_cp932_bin;
-extern CHARSET_INFO my_charset_eucjpms_japanese_ci;
-extern CHARSET_INFO my_charset_eucjpms_bin;
-extern CHARSET_INFO my_charset_euckr_korean_ci;
-extern CHARSET_INFO my_charset_euckr_bin;
-extern CHARSET_INFO my_charset_gb2312_chinese_ci;
-extern CHARSET_INFO my_charset_gb2312_bin;
-extern CHARSET_INFO my_charset_gbk_chinese_ci;
-extern CHARSET_INFO my_charset_gbk_bin;
-extern CHARSET_INFO my_charset_latin1;
-extern CHARSET_INFO my_charset_latin1_german2_ci;
-extern CHARSET_INFO my_charset_latin1_bin;
-extern CHARSET_INFO my_charset_latin2_czech_ci;
-extern CHARSET_INFO my_charset_sjis_japanese_ci;
-extern CHARSET_INFO my_charset_sjis_bin;
-extern CHARSET_INFO my_charset_tis620_thai_ci;
-extern CHARSET_INFO my_charset_tis620_bin;
-extern CHARSET_INFO my_charset_ucs2_general_ci;
-extern CHARSET_INFO my_charset_ucs2_bin;
-extern CHARSET_INFO my_charset_ucs2_general_uca;
-extern CHARSET_INFO my_charset_ujis_japanese_ci;
-extern CHARSET_INFO my_charset_ujis_bin;
-extern CHARSET_INFO my_charset_utf8_general_ci;
-extern CHARSET_INFO my_charset_utf8_bin;
-extern CHARSET_INFO my_charset_cp1250_czech_ci;
-
-/* declarations for simple charsets */
-extern int  my_strnxfrm_simple(CHARSET_INFO *, uchar *, uint, const uchar *,
-                               uint); 
-uint  my_strnxfrmlen_simple(CHARSET_INFO *, uint); 
-extern int  my_strnncoll_simple(CHARSET_INFO *, const uchar *, uint,
-				const uchar *, uint, my_bool);
-
-extern int  my_strnncollsp_simple(CHARSET_INFO *, const uchar *, uint,
-                                  const uchar *, uint,
-                                  my_bool diff_if_only_endspace_difference);
-
-extern void my_hash_sort_simple(CHARSET_INFO *cs,
-				const uchar *key, uint len,
-				ulong *nr1, ulong *nr2); 
-
-extern uint my_lengthsp_8bit(CHARSET_INFO *cs, const char *ptr, uint length);
-
-extern uint my_instr_simple(struct charset_info_st *,
-                            const char *b, uint b_length,
-                            const char *s, uint s_length,
-                            my_match_t *match, uint nmatch);
-
-
-/* Functions for 8bit */
-extern void my_caseup_str_8bit(CHARSET_INFO *, char *);
-extern void my_casedn_str_8bit(CHARSET_INFO *, char *);
-extern uint my_caseup_8bit(CHARSET_INFO *, char *src, uint srclen,
-                                           char *dst, uint dstlen);
-extern uint my_casedn_8bit(CHARSET_INFO *, char *src, uint srclen,
-                                           char *dst, uint dstlen);
-
-extern int my_strcasecmp_8bit(CHARSET_INFO * cs, const char *, const char *);
-
-int my_mb_wc_8bit(CHARSET_INFO *cs,my_wc_t *wc, const uchar *s,const uchar *e);
-int my_wc_mb_8bit(CHARSET_INFO *cs,my_wc_t wc, uchar *s, uchar *e);
-
-ulong my_scan_8bit(CHARSET_INFO *cs, const char *b, const char *e, int sq);
-
-int my_snprintf_8bit(struct charset_info_st *, char *to, uint n,
-		     const char *fmt, ...);
-
-long        my_strntol_8bit(CHARSET_INFO *, const char *s, uint l, int base,
-			    char **e, int *err);
-ulong      my_strntoul_8bit(CHARSET_INFO *, const char *s, uint l, int base,
-			    char **e, int *err);
-longlong   my_strntoll_8bit(CHARSET_INFO *, const char *s, uint l, int base,
-			    char **e, int *err);
-ulonglong my_strntoull_8bit(CHARSET_INFO *, const char *s, uint l, int base,
-			    char **e, int *err);
-double      my_strntod_8bit(CHARSET_INFO *, char *s, uint l,char **e,
-			    int *err);
-int  my_long10_to_str_8bit(CHARSET_INFO *, char *to, uint l, int radix,
-			   long int val);
-int my_longlong10_to_str_8bit(CHARSET_INFO *, char *to, uint l, int radix,
-			      longlong val);
-
-longlong my_strtoll10_8bit(CHARSET_INFO *cs,
-                           const char *nptr, char **endptr, int *error);
-longlong my_strtoll10_ucs2(CHARSET_INFO *cs, 
-                           const char *nptr, char **endptr, int *error);
-
-void my_fill_8bit(CHARSET_INFO *cs, char* to, uint l, int fill);
-
-my_bool  my_like_range_simple(CHARSET_INFO *cs,
-			      const char *ptr, uint ptr_length,
-			      pbool escape, pbool w_one, pbool w_many,
-			      uint res_length,
-			      char *min_str, char *max_str,
-			      uint *min_length, uint *max_length);
-
-my_bool  my_like_range_mb(CHARSET_INFO *cs,
-			  const char *ptr, uint ptr_length,
-			  pbool escape, pbool w_one, pbool w_many,
-			  uint res_length,
-			  char *min_str, char *max_str,
-			  uint *min_length, uint *max_length);
-
-my_bool  my_like_range_ucs2(CHARSET_INFO *cs,
-			    const char *ptr, uint ptr_length,
-			    pbool escape, pbool w_one, pbool w_many,
-			    uint res_length,
-			    char *min_str, char *max_str,
-			    uint *min_length, uint *max_length);
-
-
-int my_wildcmp_8bit(CHARSET_INFO *,
-		    const char *str,const char *str_end,
-		    const char *wildstr,const char *wildend,
-		    int escape, int w_one, int w_many);
-
-int my_wildcmp_bin(CHARSET_INFO *,
-		   const char *str,const char *str_end,
-		   const char *wildstr,const char *wildend,
-		   int escape, int w_one, int w_many);
-
-uint my_numchars_8bit(CHARSET_INFO *, const char *b, const char *e);
-uint my_numcells_8bit(CHARSET_INFO *, const char *b, const char *e);
-uint my_charpos_8bit(CHARSET_INFO *, const char *b, const char *e, uint pos);
-uint my_well_formed_len_8bit(CHARSET_INFO *, const char *b, const char *e,
-                             uint pos, int *error);
-int my_mbcharlen_8bit(CHARSET_INFO *, uint c);
-
-
-/* Functions for multibyte charsets */
-extern void my_caseup_str_mb(CHARSET_INFO *, char *);
-extern void my_casedn_str_mb(CHARSET_INFO *, char *);
-extern uint my_caseup_mb(CHARSET_INFO *, char *src, uint srclen,
-                                         char *dst, uint dstlen);
-extern uint my_casedn_mb(CHARSET_INFO *, char *src, uint srclen,
-                                         char *dst, uint dstlen);
-extern int my_strcasecmp_mb(CHARSET_INFO * cs,const char *, const char *);
-
-int my_wildcmp_mb(CHARSET_INFO *,
-		  const char *str,const char *str_end,
-		  const char *wildstr,const char *wildend,
-		  int escape, int w_one, int w_many);
-uint my_numchars_mb(CHARSET_INFO *, const char *b, const char *e);
-uint my_numcells_mb(CHARSET_INFO *, const char *b, const char *e);
-uint my_charpos_mb(CHARSET_INFO *, const char *b, const char *e, uint pos);
-uint my_well_formed_len_mb(CHARSET_INFO *, const char *b, const char *e,
-                           uint pos, int *error);
-uint my_instr_mb(struct charset_info_st *,
-                 const char *b, uint b_length,
-                 const char *s, uint s_length,
-                 my_match_t *match, uint nmatch);
-
-int my_wildcmp_unicode(CHARSET_INFO *cs,
-                       const char *str, const char *str_end,
-                       const char *wildstr, const char *wildend,
-                       int escape, int w_one, int w_many,
-                       MY_UNICASE_INFO **weights);
-
-extern my_bool my_parse_charset_xml(const char *bug, uint len,
-				    int (*add)(CHARSET_INFO *cs));
-
-my_bool my_propagate_simple(CHARSET_INFO *cs, const uchar *str, uint len);
-my_bool my_propagate_complex(CHARSET_INFO *cs, const uchar *str, uint len);
-
-
-#define	_MY_U	01	/* Upper case */
-#define	_MY_L	02	/* Lower case */
-#define	_MY_NMR	04	/* Numeral (digit) */
-#define	_MY_SPC	010	/* Spacing character */
-#define	_MY_PNT	020	/* Punctuation */
-#define	_MY_CTR	040	/* Control character */
-#define	_MY_B	0100	/* Blank */
-#define	_MY_X	0200	/* heXadecimal digit */
-
-
-#define	my_isascii(c)	(!((c) & ~0177))
-#define	my_toascii(c)	((c) & 0177)
-#define my_tocntrl(c)	((c) & 31)
-#define my_toprint(c)	((c) | 64)
-#define my_toupper(s,c)	(char) ((s)->to_upper[(uchar) (c)])
-#define my_tolower(s,c)	(char) ((s)->to_lower[(uchar) (c)])
-#define	my_isalpha(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_MY_U | _MY_L))
-#define	my_isupper(s, c)  (((s)->ctype+1)[(uchar) (c)] & _MY_U)
-#define	my_islower(s, c)  (((s)->ctype+1)[(uchar) (c)] & _MY_L)
-#define	my_isdigit(s, c)  (((s)->ctype+1)[(uchar) (c)] & _MY_NMR)
-#define	my_isxdigit(s, c) (((s)->ctype+1)[(uchar) (c)] & _MY_X)
-#define	my_isalnum(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_MY_U | _MY_L | _MY_NMR))
-#define	my_isspace(s, c)  (((s)->ctype+1)[(uchar) (c)] & _MY_SPC)
-#define	my_ispunct(s, c)  (((s)->ctype+1)[(uchar) (c)] & _MY_PNT)
-#define	my_isprint(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_MY_PNT | _MY_U | _MY_L | _MY_NMR | _MY_B))
-#define	my_isgraph(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_MY_PNT | _MY_U | _MY_L | _MY_NMR))
-#define	my_iscntrl(s, c)  (((s)->ctype+1)[(uchar) (c)] & _MY_CTR)
-
-/* Some macros that should be cleaned up a little */
-#define my_isvar(s,c)                 (my_isalnum(s,c) || (c) == '_')
-#define my_isvar_start(s,c)           (my_isalpha(s,c) || (c) == '_')
-
-#define my_binary_compare(s)	      ((s)->state  & MY_CS_BINSORT)
-#define use_strnxfrm(s)               ((s)->state  & MY_CS_STRNXFRM)
-#define my_strnxfrm(s, a, b, c, d)    ((s)->coll->strnxfrm((s), (a), (b), (c), (d)))
-#define my_strnncoll(s, a, b, c, d) ((s)->coll->strnncoll((s), (a), (b), (c), (d), 0))
-#define my_like_range(s, a, b, c, d, e, f, g, h, i, j) \
-   ((s)->coll->like_range((s), (a), (b), (c), (d), (e), (f), (g), (h), (i), (j)))
-#define my_wildcmp(cs,s,se,w,we,e,o,m) ((cs)->coll->wildcmp((cs),(s),(se),(w),(we),(e),(o),(m)))
-#define my_strcasecmp(s, a, b)        ((s)->coll->strcasecmp((s), (a), (b)))
-#define my_charpos(cs, b, e, num)     (cs)->cset->charpos((cs), (const char*) (b), (const char *)(e), (num))
-
-
-#define use_mb(s)                     ((s)->cset->ismbchar != NULL)
-#define my_ismbchar(s, a, b)          ((s)->cset->ismbchar((s), (a), (b)))
-#ifdef USE_MB
-#define my_mbcharlen(s, a)            ((s)->cset->mbcharlen((s),(a)))
-#else
-#define my_mbcharlen(s, a)            1
-#endif
-
-#define my_caseup_str(s, a)           ((s)->cset->caseup_str((s), (a)))
-#define my_casedn_str(s, a)           ((s)->cset->casedn_str((s), (a)))
-#define my_strntol(s, a, b, c, d, e)  ((s)->cset->strntol((s),(a),(b),(c),(d),(e)))
-#define my_strntoul(s, a, b, c, d, e) ((s)->cset->strntoul((s),(a),(b),(c),(d),(e)))
-#define my_strntoll(s, a, b, c, d, e) ((s)->cset->strntoll((s),(a),(b),(c),(d),(e)))
-#define my_strntoull(s, a, b, c,d, e) ((s)->cset->strntoull((s),(a),(b),(c),(d),(e)))
-#define my_strntod(s, a, b, c, d)     ((s)->cset->strntod((s),(a),(b),(c),(d)))
-
-
-/* XXX: still need to take care of this one */
-#ifdef MY_CHARSET_TIS620
-#error The TIS620 charset is broken at the moment.  Tell tim to fix it.
-#define USE_TIS620
-#include "t_ctype.h"
-#endif
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif /* _m_ctype_h */
diff --git a/src/mysql/my_alloc.h b/src/mysql/my_alloc.h
deleted file mode 100644
index 1641b3acf..000000000
--- a/src/mysql/my_alloc.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/* 
-   Data structures for mysys/my_alloc.c (root memory allocator)
-*/
-
-#ifndef _my_alloc_h
-#define _my_alloc_h
-
-#define ALLOC_MAX_BLOCK_TO_DROP			4096
-#define ALLOC_MAX_BLOCK_USAGE_BEFORE_DROP	10
-
-typedef struct st_used_mem
-{				   /* struct for once_alloc (block) */
-  struct st_used_mem *next;	   /* Next block in use */
-  unsigned int	left;		   /* memory left in block  */
-  unsigned int	size;		   /* size of block */
-} USED_MEM;
-
-
-typedef struct st_mem_root
-{
-  USED_MEM *free;                  /* blocks with free memory in it */
-  USED_MEM *used;                  /* blocks almost without free memory */
-  USED_MEM *pre_alloc;             /* preallocated block */
-  /* if block have less memory it will be put in 'used' list */
-  unsigned int min_malloc;
-  unsigned int block_size;         /* initial block size */
-  unsigned int block_num;          /* allocated blocks counter */
-  /* 
-     first free block in queue test counter (if it exceed 
-     MAX_BLOCK_USAGE_BEFORE_DROP block will be dropped in 'used' list)
-  */
-  unsigned int first_block_usage;
-
-  void (*error_handler)(void);
-} MEM_ROOT;
-#endif
diff --git a/src/mysql/my_dbug.h b/src/mysql/my_dbug.h
deleted file mode 100644
index b76a3fcc8..000000000
--- a/src/mysql/my_dbug.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifndef _dbug_h
-#define _dbug_h
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-#if !defined(DBUG_OFF) && !defined(_lint)
-extern	int _db_on_,_no_db_;
-extern	FILE *_db_fp_;
-extern	char *_db_process_;
-extern	int _db_keyword_(const char *keyword);
-extern  int _db_strict_keyword_(const char *keyword);
-extern	void _db_setjmp_(void);
-extern	void _db_longjmp_(void);
-extern	void _db_push_(const char *control);
-extern	void _db_pop_(void);
-extern	void _db_enter_(const char *_func_,const char *_file_,uint _line_,
-			const char **_sfunc_,const char **_sfile_,
-			uint *_slevel_, char ***);
-extern	void _db_return_(uint _line_,const char **_sfunc_,const char **_sfile_,
-			 uint *_slevel_);
-extern	void _db_pargs_(uint _line_,const char *keyword);
-extern	void _db_doprnt_ _VARARGS((const char *format,...));
-extern	void _db_dump_(uint _line_,const char *keyword,const char *memory,
-		       uint length);
-extern	void _db_output_(uint flag);
-extern	void _db_lock_file(void);
-extern	void _db_unlock_file(void);
-
-#define DBUG_ENTER(a) const char *_db_func_, *_db_file_; uint _db_level_; \
-	char **_db_framep_; \
-	_db_enter_ (a,__FILE__,__LINE__,&_db_func_,&_db_file_,&_db_level_, \
-		    &_db_framep_)
-#define DBUG_LEAVE \
-	(_db_return_ (__LINE__, &_db_func_, &_db_file_, &_db_level_))
-#define DBUG_RETURN(a1) {DBUG_LEAVE; return(a1);}
-#define DBUG_VOID_RETURN {DBUG_LEAVE; return;}
-#define DBUG_EXECUTE(keyword,a1) \
-	{if (_db_on_) {if (_db_keyword_ (keyword)) { a1 }}}
-#define DBUG_PRINT(keyword,arglist) \
-	{if (_db_on_) {_db_pargs_(__LINE__,keyword); _db_doprnt_ arglist;}}
-#define DBUG_PUSH(a1) _db_push_ (a1)
-#define DBUG_POP() _db_pop_ ()
-#define DBUG_PROCESS(a1) (_db_process_ = a1)
-#define DBUG_FILE (_db_fp_)
-#define DBUG_SETJMP(a1) (_db_setjmp_ (), setjmp (a1))
-#define DBUG_LONGJMP(a1,a2) (_db_longjmp_ (), longjmp (a1, a2))
-#define DBUG_DUMP(keyword,a1,a2)\
-	{if (_db_on_) {_db_dump_(__LINE__,keyword,a1,a2);}}
-#define DBUG_IN_USE (_db_fp_ && _db_fp_ != stderr)
-#define DEBUGGER_OFF _no_db_=1;_db_on_=0;
-#define DEBUGGER_ON  _no_db_=0
-#define DBUG_LOCK_FILE { _db_lock_file(); }
-#define DBUG_UNLOCK_FILE { _db_unlock_file(); }
-#define DBUG_OUTPUT(A) { _db_output_(A); }
-#define DBUG_ASSERT(A) assert(A)
-#define DBUG_EXECUTE_IF(keyword,a1) \
-        {if (_db_on_) {if (_db_strict_keyword_ (keyword)) { a1 }}}
-#else						/* No debugger */
-
-#define DBUG_ENTER(a1)
-#define DBUG_RETURN(a1) return(a1)
-#define DBUG_VOID_RETURN return
-#define DBUG_EXECUTE(keyword,a1) {}
-#define DBUG_EXECUTE_IF(keyword,a1) {}
-#define DBUG_PRINT(keyword,arglist) {}
-#define DBUG_PUSH(a1) {}
-#define DBUG_POP() {}
-#define DBUG_PROCESS(a1) {}
-#define DBUG_FILE (stderr)
-#define DBUG_SETJMP setjmp
-#define DBUG_LONGJMP longjmp
-#define DBUG_DUMP(keyword,a1,a2) {}
-#define DBUG_IN_USE 0
-#define DEBUGGER_OFF
-#define DEBUGGER_ON
-#define DBUG_LOCK_FILE
-#define DBUG_UNLOCK_FILE
-#define DBUG_OUTPUT(A)
-#define DBUG_ASSERT(A) {}
-#endif
-#ifdef	__cplusplus
-}
-#endif
-#endif
diff --git a/src/mysql/my_global.h b/src/mysql/my_global.h
deleted file mode 100644
index 2417477e2..000000000
--- a/src/mysql/my_global.h
+++ /dev/null
@@ -1,1306 +0,0 @@
-/* Copyright (C) 2000-2003 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/* This is the include file that should be included 'first' in every C file. */
-
-#ifndef _global_h
-#define _global_h
-
-#ifndef EMBEDDED_LIBRARY
-#define HAVE_REPLICATION
-#define HAVE_EXTERNAL_CLIENT
-#endif
-
-#if defined( __EMX__) && !defined( MYSQL_SERVER)
-/* moved here to use below VOID macro redefinition */
-#define INCL_BASE
-#define INCL_NOPMAPI
-#include <os2.h>
-#endif /* __EMX__ */
-
-#ifdef __CYGWIN__
-/* We use a Unix API, so pretend it's not Windows */
-#undef WIN
-#undef WIN32
-#undef _WIN
-#undef _WIN32
-#undef _WIN64
-#undef __WIN__
-#undef __WIN32__
-#define HAVE_ERRNO_AS_DEFINE
-#endif /* __CYGWIN__ */
-
-#if defined(__QNXNTO__) && !defined(FD_SETSIZE)
-#define FD_SETSIZE 1024         /* Max number of file descriptor bits in
-                                   fd_set, used when calling 'select'
-                                   Must be defined before including
-                                   "sys/select.h" and "sys/time.h"
-                                 */
-#endif
-
-
-/* to make command line shorter we'll define USE_PRAGMA_INTERFACE here */
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#define USE_PRAGMA_INTERFACE
-#endif
-
-#if defined(i386) && !defined(__i386__)
-#define __i386__
-#endif
-
-/* Macros to make switching between C and C++ mode easier */
-#ifdef __cplusplus
-#define C_MODE_START    extern "C" {
-#define C_MODE_END	}
-#else
-#define C_MODE_START
-#define C_MODE_END
-#endif
-
-#if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32)
-#include <config-win.h>
-#elif defined(OS2)
-#include <config-os2.h>
-#elif defined(__NETWARE__)
-#include <my_config.h>
-#include <config-netware.h>
-#if defined(__cplusplus) && defined(inline)
-#undef inline				/* fix configure problem */
-#endif
-#else
-#include <my_config.h>
-#if defined(__cplusplus) && defined(inline)
-#undef inline				/* fix configure problem */
-#endif
-#endif /* _WIN32... */
-
-/* Some defines to avoid ifdefs in the code */
-#ifndef NETWARE_YIELD
-#define NETWARE_YIELD
-#define NETWARE_SET_SCREEN_MODE(A)
-#endif
-
-#include "../common/strlib.h"
-
-/*
-  The macros below are borrowed from include/linux/compiler.h in the
-  Linux kernel. Use them to indicate the likelyhood of the truthfulness
-  of a condition. This serves two purposes - newer versions of gcc will be
-  able to optimize for branch predication, which could yield siginficant
-  performance gains in frequently executed sections of the code, and the
-  other reason to use them is for documentation
-*/
-
-#if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
-#define __builtin_expect(x, expected_value) (x)
-#endif
-
-#define likely(x)	__builtin_expect((x),1)
-#define unlikely(x)	__builtin_expect((x),0)
-
-
-/* Fix problem with S_ISLNK() on Linux */
-#if defined(TARGET_OS_LINUX)
-#undef  _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-
-/*
-  Temporary solution to solve bug#7156. Include "sys/types.h" before
-  the thread headers, else the function madvise() will not be defined
-*/
-#if defined(HAVE_SYS_TYPES_H) && ( defined(sun) || defined(__sun) )
-#include <sys/types.h>
-#endif
-
-/* The client defines this to avoid all thread code */
-#if defined(UNDEF_THREADS_HACK)
-#undef THREAD
-#undef HAVE_mit_thread
-#undef HAVE_LINUXTHREADS
-#undef HAVE_NPTL
-#undef HAVE_UNIXWARE7_THREADS
-#endif
-
-#ifdef HAVE_THREADS_WITHOUT_SOCKETS
-/* MIT pthreads does not work with unix sockets */
-#undef HAVE_SYS_UN_H
-#endif
-
-#define __EXTENSIONS__ 1	/* We want some extension */
-#ifndef __STDC_EXT__
-#define __STDC_EXT__ 1          /* To get large file support on hpux */
-#endif
-
-/*
-  Solaris 9 include file <sys/feature_tests.h> refers to X/Open document
-
-    System Interfaces and Headers, Issue 5
-
-  saying we should define _XOPEN_SOURCE=500 to get POSIX.1c prototypes,
-  but apparently other systems (namely FreeBSD) don't agree.
-
-  On a newer Solaris 10, the above file recognizes also _XOPEN_SOURCE=600.
-  Furthermore, it tests that if a program requires older standard
-  (_XOPEN_SOURCE<600 or _POSIX_C_SOURCE<200112L) it cannot be
-  run on a new compiler (that defines _STDC_C99) and issues an #error.
-  It's also an #error if a program requires new standard (_XOPEN_SOURCE=600
-  or _POSIX_C_SOURCE=200112L) and a compiler does not define _STDC_C99.
-
-  To add more to this mess, Sun Studio C compiler defines _STDC_C99 while
-  C++ compiler does not!
-
-  So, in a desperate attempt to get correct prototypes for both
-  C and C++ code, we define either _XOPEN_SOURCE=600 or _XOPEN_SOURCE=500
-  depending on the compiler's announced C standard support.
-
-  Cleaner solutions are welcome.
-*/
-#ifdef __sun
-#if __STDC_VERSION__ - 0 >= 199901L
-#define _XOPEN_SOURCE 600
-#else
-#define _XOPEN_SOURCE 500
-#endif
-#endif
-
-#if defined(THREAD) && !defined(__WIN__) && !defined(OS2)
-#ifndef _POSIX_PTHREAD_SEMANTICS
-#define _POSIX_PTHREAD_SEMANTICS /* We want posix threads */
-#endif
-
-#if !defined(SCO)
-#define _REENTRANT	1	/* Some thread libraries require this */
-#endif
-#if !defined(_THREAD_SAFE) && !defined(_AIX)
-#define _THREAD_SAFE            /* Required for OSF1 */
-#endif
-#ifndef HAVE_mit_thread
-#ifdef HAVE_UNIXWARE7_THREADS
-#include <thread.h>
-#else
-#if defined(HPUX10) || defined(HPUX11)
-C_MODE_START			/* HPUX needs this, signal.h bug */
-#include <pthread.h>
-C_MODE_END
-#else
-#include <pthread.h>		/* AIX must have this included first */
-#endif
-#endif /* HAVE_UNIXWARE7_THREADS */
-#endif /* HAVE_mit_thread */
-#if !defined(SCO) && !defined(_REENTRANT)
-#define _REENTRANT	1	/* Threads requires reentrant code */
-#endif
-#endif /* THREAD */
-
-/* Go around some bugs in different OS and compilers */
-#ifdef _AIX			/* By soren@t.dk */
-#define _H_STRINGS
-#define _SYS_STREAM_H
-/* #define _AIX32_CURSES */	/* XXX: this breaks AIX 4.3.3 (others?). */
-#define ulonglong2double(A) my_ulonglong2double(A)
-#define my_off_t2double(A)  my_ulonglong2double(A)
-C_MODE_START
-double my_ulonglong2double(unsigned long long A);
-C_MODE_END
-#endif /* _AIX */
-
-#ifdef HAVE_BROKEN_SNPRINTF	/* HPUX 10.20 don't have this defined */
-#undef HAVE_SNPRINTF
-#endif
-#ifdef HAVE_BROKEN_PREAD
-/*
-  pread()/pwrite() are not 64 bit safe on HP-UX 11.0 without
-  installing the kernel patch PHKL_20349 or greater
-*/
-#undef HAVE_PREAD
-#undef HAVE_PWRITE
-#endif
-#if defined(HAVE_BROKEN_INLINE) && !defined(__cplusplus)
-#undef inline
-#define inline
-#endif
-
-#ifdef UNDEF_HAVE_GETHOSTBYNAME_R		/* For OSF4.x */
-#undef HAVE_GETHOSTBYNAME_R
-#endif
-#ifdef UNDEF_HAVE_INITGROUPS			/* For AIX 4.3 */
-#undef HAVE_INITGROUPS
-#endif
-
-/* gcc/egcs issues */
-
-#if defined(__GNUC) && defined(__EXCEPTIONS)
-#error "Please add -fno-exceptions to CXXFLAGS and reconfigure/recompile"
-#endif
-
-
-/* Fix a bug in gcc 2.8.0 on IRIX 6.2 */
-#if SIZEOF_LONG == 4 && defined(__LONG_MAX__) && (__GNUC__ == 2 && __GNUC_MINOR__ == 8)
-#undef __LONG_MAX__             /* Is a longlong value in gcc 2.8.0 ??? */
-#define __LONG_MAX__ 2147483647
-#endif
-
-/* egcs 1.1.2 has a problem with memcpy on Alpha */
-#if defined(__GNUC__) && defined(__alpha__) && ! (__GNUC__ > 2 || (__GNUC__ == 2 &&  __GNUC_MINOR__ >= 95))
-#define BAD_MEMCPY
-#endif
-
-#if defined(_lint) && !defined(lint)
-#define lint
-#endif
-#if SIZEOF_LONG_LONG > 4 && !defined(_LONG_LONG)
-#define _LONG_LONG 1		/* For AIX string library */
-#endif
-
-#ifndef stdin
-#include <stdio.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-
-#include <math.h>
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif
-#ifdef HAVE_FLOAT_H
-#include <float.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifdef HAVE_SYS_TIMEB_H
-#include <sys/timeb.h>				/* Avoid warnings on SCO */
-#endif
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif /* TIME_WITH_SYS_TIME */
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#if defined(__cplusplus) && defined(NO_CPLUSPLUS_ALLOCA)
-#undef HAVE_ALLOCA
-#undef HAVE_ALLOCA_H
-#endif
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-#ifdef HAVE_ATOMIC_ADD
-#define new my_arg_new
-#define need_to_restore_new 1
-C_MODE_START
-#include <asm/atomic.h>
-C_MODE_END
-#ifdef need_to_restore_new /* probably safer than #ifdef new */
-#undef new
-#undef need_to_restore_new
-#endif
-#endif
-#include <errno.h>				/* Recommended by debian */
-/* We need the following to go around a problem with openssl on solaris */
-#if defined(HAVE_CRYPT_H)
-#include <crypt.h>
-#endif
-
-/*
-  A lot of our programs uses asserts, so better to always include it
-  This also fixes a problem when people uses DBUG_ASSERT without including
-  assert.h
-*/
-#include <assert.h>
-
-/* Go around some bugs in different OS and compilers */
-#if defined(_HPUX_SOURCE) && defined(HAVE_SYS_STREAM_H)
-#include <sys/stream.h>		/* HPUX 10.20 defines ulong here. UGLY !!! */
-#define HAVE_ULONG
-#endif
-#ifdef DONT_USE_FINITE		/* HPUX 11.x has is_finite() */
-#undef HAVE_FINITE
-#endif
-#if defined(HPUX10) && defined(_LARGEFILE64_SOURCE) && defined(THREAD)
-/* Fix bug in setrlimit */
-#undef setrlimit
-#define setrlimit cma_setrlimit64
-#endif
-/* Declare madvise where it is not declared for C++, like Solaris */
-#if HAVE_MADVISE && !HAVE_DECL_MADVISE && defined(__cplusplus)
-extern "C" int madvise(void *addr, size_t len, int behav);
-#endif
-
-#ifdef __QNXNTO__
-/* This has to be after include limits.h */
-#define HAVE_ERRNO_AS_DEFINE
-#define HAVE_FCNTL_LOCK
-#undef  HAVE_FINITE
-#undef  LONGLONG_MIN            /* These get wrongly defined in QNX 6.2 */
-#undef  LONGLONG_MAX            /* standard system library 'limits.h' */
-#ifdef __cplusplus
-#ifndef HAVE_RINT
-#define HAVE_RINT
-#endif                          /* rint() and isnan() functions are not */
-#define rint(a) std::rint(a)    /* visible in C++ scope due to an error */
-#define isnan(a) std::isnan(a)  /* in the usr/include/math.h on QNX     */
-#endif
-#endif
-
-/* We can not live without the following defines */
-
-#define USE_MYFUNC 1		/* Must use syscall indirection */
-#define MASTER 1		/* Compile without unireg */
-#define ENGLISH 1		/* Messages in English */
-#define POSIX_MISTAKE 1		/* regexp: Fix stupid spec error */
-#define USE_REGEX 1		/* We want the use the regex library */
-/* Do not define for ultra sparcs */
-#ifndef OS2
-#define USE_BMOVE512 1		/* Use this unless system bmove is faster */
-#endif
-
-#define QUOTE_ARG(x)		#x	/* Quote argument (before cpp) */
-#define STRINGIFY_ARG(x) QUOTE_ARG(x)	/* Quote argument, after cpp */
-
-/* Paranoid settings. Define I_AM_PARANOID if you are paranoid */
-#ifdef I_AM_PARANOID
-#define DONT_ALLOW_USER_CHANGE 1
-#define DONT_USE_MYSQL_PWD 1
-#endif
-
-/* Does the system remember a signal handler after a signal ? */
-#ifndef HAVE_BSD_SIGNALS
-#define DONT_REMEMBER_SIGNAL
-#endif
-
-/* Define void to stop lint from generating "null effekt" comments */
-#ifndef DONT_DEFINE_VOID
-#ifdef _lint
-int	__void__;
-#define VOID(X)		(__void__ = (int) (X))
-#else
-#undef VOID
-#define VOID(X)		(X)
-#endif
-#endif /* DONT_DEFINE_VOID */
-
-#if defined(_lint) || defined(FORCE_INIT_OF_VARS)
-#define LINT_INIT(var)	var=0			/* No uninitialize-warning */
-#else
-#define LINT_INIT(var)
-#endif
-
-#if defined(_lint) || defined(FORCE_INIT_OF_VARS) || defined(HAVE_purify)
-#define PURIFY_OR_LINT_INIT(var) var=0
-#else
-#define PURIFY_OR_LINT_INIT(var)
-#endif
-
-/* Define some useful general macros */
-#if !defined(max)
-#define max(a, b)	((a) > (b) ? (a) : (b))
-#define min(a, b)	((a) < (b) ? (a) : (b))
-#endif
-
-#if defined(__EMX__) || !defined(HAVE_UINT)
-#undef HAVE_UINT
-#define HAVE_UINT
-typedef unsigned int uint;
-typedef unsigned short ushort;
-#endif
-
-#define CMP_NUM(a,b)    (((a) < (b)) ? -1 : ((a) == (b)) ? 0 : 1)
-#define sgn(a)		(((a) < 0) ? -1 : ((a) > 0) ? 1 : 0)
-#define swap_variables(t, a, b) { register t dummy; dummy= a; a= b; b= dummy; }
-#define test(a)		((a) ? 1 : 0)
-#define set_if_bigger(a,b)  do { if ((a) < (b)) (a)=(b); } while(0)
-#define set_if_smaller(a,b) do { if ((a) > (b)) (a)=(b); } while(0)
-#define test_all_bits(a,b) (((a) & (b)) == (b))
-#define set_bits(type, bit_count) (sizeof(type)*8 <= (bit_count) ? ~(type) 0 : ((((type) 1) << (bit_count)) - (type) 1))
-#define array_elements(A) ((uint) (sizeof(A)/sizeof(A[0])))
-#ifndef HAVE_RINT
-#define rint(A) floor((A)+(((A) < 0)? -0.5 : 0.5))
-#endif
-
-/* Define some general constants */
-#ifndef TRUE
-#define TRUE		(1)	/* Logical true */
-#define FALSE		(0)	/* Logical false */
-#endif
-
-#if defined(__GNUC__)
-#define function_volatile	volatile
-#define my_reinterpret_cast(A) reinterpret_cast<A>
-#define my_const_cast(A) const_cast<A>
-#elif !defined(my_reinterpret_cast)
-#define my_reinterpret_cast(A) (A)
-#define my_const_cast(A) (A)
-#endif
-#if !defined(__attribute__) && (defined(__cplusplus) || !defined(__GNUC__)  || __GNUC__ == 2 && __GNUC_MINOR__ < 8)
-#define __attribute__(A)
-#endif
-
-/*
-  Wen using the embedded library, users might run into link problems,
-  dupicate declaration of __cxa_pure_virtual, solved by declaring it a
-  weak symbol.
-*/
-#ifdef USE_MYSYS_NEW
-C_MODE_START
-int __cxa_pure_virtual () __attribute__ ((weak));
-C_MODE_END
-#endif
-
-/* From old s-system.h */
-
-/*
-  Support macros for non ansi & other old compilers. Since such
-  things are no longer supported we do nothing. We keep then since
-  some of our code may still be needed to upgrade old customers.
-*/
-#define _VARARGS(X) X
-#define _STATIC_VARARGS(X) X
-#define _PC(X)	X
-
-#if defined(DBUG_ON) && defined(DBUG_OFF)
-#undef DBUG_OFF
-#endif
-
-#if defined(_lint) && !defined(DBUG_OFF)
-#define DBUG_OFF
-#endif
-
-#include <my_dbug.h>
-
-#define MIN_ARRAY_SIZE	0	/* Zero or One. Gcc allows zero*/
-#define ASCII_BITS_USED 8	/* Bit char used */
-#define NEAR_F			/* No near function handling */
-
-/* Some types that is different between systems */
-
-typedef int	File;		/* File descriptor */
-#ifndef Socket_defined
-typedef int	my_socket;	/* File descriptor for sockets */
-#define INVALID_SOCKET -1
-#endif
-/* Type for fuctions that handles signals */
-#define sig_handler RETSIGTYPE
-C_MODE_START
-typedef void	(*sig_return)();/* Returns type from signal */
-C_MODE_END
-#if defined(__GNUC__) && !defined(_lint)
-typedef char	pchar;		/* Mixed prototypes can take char */
-typedef char	puchar;		/* Mixed prototypes can take char */
-typedef char	pbool;		/* Mixed prototypes can take char */
-typedef short	pshort;		/* Mixed prototypes can take short int */
-typedef float	pfloat;		/* Mixed prototypes can take float */
-#else
-typedef int	pchar;		/* Mixed prototypes can't take char */
-typedef uint	puchar;		/* Mixed prototypes can't take char */
-typedef int	pbool;		/* Mixed prototypes can't take char */
-typedef int	pshort;		/* Mixed prototypes can't take short int */
-typedef double	pfloat;		/* Mixed prototypes can't take float */
-#endif
-C_MODE_START
-typedef int	(*qsort_cmp)(const void *,const void *);
-typedef int	(*qsort_cmp2)(void*, const void *,const void *);
-C_MODE_END
-#ifdef HAVE_mit_thread
-#define qsort_t void
-#undef QSORT_TYPE_IS_VOID
-#define QSORT_TYPE_IS_VOID
-#else
-#define qsort_t RETQSORTTYPE	/* Broken GCC cant handle typedef !!!! */
-#endif
-#ifdef HAVE_mit_thread
-#define size_socket socklen_t	/* Type of last arg to accept */
-#else
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-typedef SOCKET_SIZE_TYPE size_socket;
-#endif
-
-#ifndef SOCKOPT_OPTLEN_TYPE
-#define SOCKOPT_OPTLEN_TYPE size_socket
-#endif
-
-/* file create flags */
-
-#ifndef O_SHARE			/* Probably not windows */
-#define O_SHARE		0	/* Flag to my_open for shared files */
-#ifndef O_BINARY
-#define O_BINARY	0	/* Flag to my_open for binary files */
-#endif
-#ifndef FILE_BINARY
-#define FILE_BINARY	O_BINARY /* Flag to my_fopen for binary streams */
-#endif
-#ifdef HAVE_FCNTL
-#define HAVE_FCNTL_LOCK
-#define F_TO_EOF	0L	/* Param to lockf() to lock rest of file */
-#endif
-#endif /* O_SHARE */
-
-#ifndef O_TEMPORARY
-#define O_TEMPORARY	0
-#endif
-#ifndef O_SHORT_LIVED
-#define O_SHORT_LIVED	0
-#endif
-#ifndef O_NOFOLLOW
-#define O_NOFOLLOW      0
-#endif
-
-/* additional file share flags for win32 */
-#ifdef __WIN__
-#define _SH_DENYRWD     0x110    /* deny read/write mode & delete */
-#define _SH_DENYWRD     0x120    /* deny write mode & delete      */
-#define _SH_DENYRDD     0x130    /* deny read mode & delete       */
-#define _SH_DENYDEL     0x140    /* deny delete only              */
-#endif /* __WIN__ */
-
-
-/* #define USE_RECORD_LOCK	*/
-
-	/* Unsigned types supported by the compiler */
-#define UNSINT8			/* unsigned int8 (char) */
-#define UNSINT16		/* unsigned int16 */
-#define UNSINT32		/* unsigned int32 */
-
-	/* General constants */
-#define SC_MAXWIDTH	256	/* Max width of screen (for error messages) */
-#define FN_LEN		256	/* Max file name len */
-#define FN_HEADLEN	253	/* Max length of filepart of file name */
-#define FN_EXTLEN	20	/* Max length of extension (part of FN_LEN) */
-#define FN_REFLEN	512	/* Max length of full path-name */
-#define FN_EXTCHAR	'.'
-#define FN_HOMELIB	'~'	/* ~/ is used as abbrev for home dir */
-#define FN_CURLIB	'.'	/* ./ is used as abbrev for current dir */
-#define FN_PARENTDIR	".."	/* Parent directory; Must be a string */
-#define FN_DEVCHAR	':'
-
-#ifndef FN_LIBCHAR
-#ifdef __EMX__
-#define FN_LIBCHAR	'\\'
-#define FN_ROOTDIR	"\\"
-#else
-#define FN_LIBCHAR	'/'
-#define FN_ROOTDIR	"/"
-#endif
-#endif
-#define MY_NFILE	64	/* This is only used to save filenames */
-#ifndef OS_FILE_LIMIT
-#define OS_FILE_LIMIT	65535
-#endif
-
-/* #define EXT_IN_LIBNAME     */
-/* #define FN_NO_CASE_SENCE   */
-/* #define FN_UPPER_CASE TRUE */
-
-/*
-  Io buffer size; Must be a power of 2 and a multiple of 512. May be
-  smaller what the disk page size. This influences the speed of the
-  isam btree library. eg to big to slow.
-*/
-#define IO_SIZE			4096
-/*
-  How much overhead does malloc have. The code often allocates
-  something like 1024-MALLOC_OVERHEAD bytes
-*/
-#ifdef SAFEMALLOC
-#define MALLOC_OVERHEAD (8+24+4)
-#else
-#define MALLOC_OVERHEAD 8
-#endif
-	/* get memory in huncs */
-#define ONCE_ALLOC_INIT		(uint) (4096-MALLOC_OVERHEAD)
-	/* Typical record cash */
-#define RECORD_CACHE_SIZE	(uint) (64*1024-MALLOC_OVERHEAD)
-	/* Typical key cash */
-#define KEY_CACHE_SIZE		(uint) (8*1024*1024-MALLOC_OVERHEAD)
-	/* Default size of a key cache block  */
-#define KEY_CACHE_BLOCK_SIZE	(uint) 1024
-
-
-	/* Some things that this system doesn't have */
-
-#define NO_HASH			/* Not needed anymore */
-#ifdef __WIN__
-#define NO_DIR_LIBRARY		/* Not standar dir-library */
-#define USE_MY_STAT_STRUCT	/* For my_lib */
-#endif
-
-/* Some defines of functions for portability */
-
-#undef remove		/* Crashes MySQL on SCO 5.0.0 */
-#ifndef __WIN__
-#ifdef OS2
-#define closesocket(A)	soclose(A)
-#else
-#define closesocket(A)	close(A)
-#endif
-#ifndef ulonglong2double
-#define ulonglong2double(A) ((double) (ulonglong) (A))
-#define my_off_t2double(A)  ((double) (my_off_t) (A))
-#endif
-#endif
-
-#ifndef offsetof
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-#endif
-#define ulong_to_double(X) ((double) (ulong) (X))
-#define SET_STACK_SIZE(X)	/* Not needed on real machines */
-
-#if !defined(HAVE_mit_thread) && !defined(HAVE_STRTOK_R)
-#define strtok_r(A,B,C) strtok((A),(B))
-#endif
-
-/* Remove some things that mit_thread break or doesn't support */
-#if defined(HAVE_mit_thread) && defined(THREAD)
-#undef HAVE_PREAD
-#undef HAVE_REALPATH
-#undef HAVE_MLOCK
-#undef HAVE_TEMPNAM				/* Use ours */
-#undef HAVE_PTHREAD_SETPRIO
-#undef HAVE_FTRUNCATE
-#undef HAVE_READLINK
-#endif
-
-/* This is from the old m-machine.h file */
-
-#if SIZEOF_LONG_LONG > 4
-#define HAVE_LONG_LONG 1
-#endif
-
-/*
-  Some pre-ANSI-C99 systems like AIX 5.1 and Linux/GCC 2.95 define
-  ULONGLONG_MAX, LONGLONG_MIN, LONGLONG_MAX; we use them if they're defined.
-  Also on Windows we define these constants by hand in config-win.h.
-*/
-
-#if defined(HAVE_LONG_LONG) && !defined(LONGLONG_MIN)
-#define LONGLONG_MIN	((long long) 0x8000000000000000LL)
-#define LONGLONG_MAX	((long long) 0x7FFFFFFFFFFFFFFFLL)
-#endif
-
-#if defined(HAVE_LONG_LONG) && !defined(ULONGLONG_MAX)
-/* First check for ANSI C99 definition: */
-#ifdef ULLONG_MAX
-#define ULONGLONG_MAX  ULLONG_MAX
-#else
-#define ULONGLONG_MAX ((unsigned long long)(~0ULL))
-#endif
-#endif /* defined (HAVE_LONG_LONG) && !defined(ULONGLONG_MAX)*/
-
-#define INT_MIN32       (~0x7FFFFFFFL)
-#define INT_MAX32       0x7FFFFFFFL
-#define UINT_MAX32      0xFFFFFFFFL
-#define INT_MIN24       (~0x007FFFFF)
-#define INT_MAX24       0x007FFFFF
-#define UINT_MAX24      0x00FFFFFF
-#define INT_MIN16       (~0x7FFF)
-#define INT_MAX16       0x7FFF
-#define UINT_MAX16      0xFFFF
-#define INT_MIN8        (~0x7F)
-#define INT_MAX8        0x7F
-#define UINT_MAX8       0xFF
-
-/* From limits.h instead */
-#ifndef DBL_MIN
-#define DBL_MIN		4.94065645841246544e-324
-#define FLT_MIN		((float)1.40129846432481707e-45)
-#endif
-#ifndef DBL_MAX
-#define DBL_MAX		1.79769313486231470e+308
-#define FLT_MAX		((float)3.40282346638528860e+38)
-#endif
-
-#if !defined(HAVE_ISINF) && !defined(isinf)
-#define isinf(X)    0
-#endif
-
-/* Define missing math constants. */
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-#ifndef M_E
-#define M_E 2.7182818284590452354
-#endif
-#ifndef M_LN2
-#define M_LN2 0.69314718055994530942
-#endif
-
-/*
-  Max size that must be added to a so that we know Size to make
-  adressable obj.
-*/
-#if SIZEOF_CHARP == 4
-typedef long		my_ptrdiff_t;
-#else
-typedef long long	my_ptrdiff_t;
-#endif
-
-#define MY_ALIGN(A,L)	(((A) + (L) - 1) & ~((L) - 1))
-#define ALIGN_SIZE(A)	MY_ALIGN((A),sizeof(double))
-/* Size to make adressable obj. */
-#define ALIGN_PTR(A, t) ((t*) MY_ALIGN((A),sizeof(t)))
-			 /* Offset of field f in structure t */
-#define OFFSET(t, f)	((size_t)(char *)&((t *)0)->f)
-#define ADD_TO_PTR(ptr,size,type) (type) ((byte*) (ptr)+size)
-#define PTR_BYTE_DIFF(A,B) (my_ptrdiff_t) ((byte*) (A) - (byte*) (B))
-
-#define NullS		(char *) 0
-/* Nowdays we do not support MessyDos */
-#ifndef NEAR
-#define NEAR				/* Who needs segments ? */
-#define FAR				/* On a good machine */
-#ifndef HUGE_PTR
-#define HUGE_PTR
-#endif
-#endif
-#if defined(__IBMC__) || defined(__IBMCPP__)
-/* This was  _System _Export but caused a lot of warnings on _AIX43 */
-#define STDCALL
-#elif !defined( STDCALL)
-#define STDCALL
-#endif
-
-/* Typdefs for easyier portability */
-
-#if defined(VOIDTYPE)
-typedef void	*gptr;		/* Generic pointer */
-#else
-typedef char	*gptr;		/* Generic pointer */
-#endif
-#ifndef HAVE_INT_8_16_32
-typedef signed char int8;       /* Signed integer >= 8  bits */
-typedef short	int16;		/* Signed integer >= 16 bits */
-#endif
-#ifndef HAVE_UCHAR
-typedef unsigned char	uchar;	/* Short for unsigned char */
-#endif
-typedef unsigned char	uint8;	/* Short for unsigned integer >= 8  bits */
-typedef unsigned short	uint16; /* Short for unsigned integer >= 16 bits */
-
-#if SIZEOF_INT == 4
-#ifndef HAVE_INT_8_16_32
-typedef int		int32;
-#endif
-typedef unsigned int	uint32; /* Short for unsigned integer >= 32 bits */
-#elif SIZEOF_LONG == 4
-#ifndef HAVE_INT_8_16_32
-typedef long		int32;
-#endif
-typedef unsigned long	uint32; /* Short for unsigned integer >= 32 bits */
-#else
-#error "Neither int or long is of 4 bytes width"
-#endif
-
-#if !defined(HAVE_ULONG) && !defined(TARGET_OS_LINUX) && !defined(__USE_MISC)
-typedef unsigned long	ulong;		  /* Short for unsigned long */
-#endif
-#ifndef longlong_defined
-#if defined(HAVE_LONG_LONG) && SIZEOF_LONG != 8
-typedef unsigned long long int ulonglong; /* ulong or unsigned long long */
-typedef long long int	longlong;
-#else
-typedef unsigned long	ulonglong;	  /* ulong or unsigned long long */
-typedef long		longlong;
-#endif
-#endif
-
-#if defined(NO_CLIENT_LONG_LONG)
-typedef unsigned long my_ulonglong;
-#elif defined (__WIN__)
-typedef unsigned __int64 my_ulonglong;
-#else
-typedef unsigned long long my_ulonglong;
-#endif
-
-#ifdef USE_RAID
-/*
-  The following is done with a if to not get problems with pre-processors
-  with late define evaluation
-*/
-#if SIZEOF_OFF_T == 4
-#define SYSTEM_SIZEOF_OFF_T 4
-#else
-#define SYSTEM_SIZEOF_OFF_T 8
-#endif
-#undef  SIZEOF_OFF_T
-#define SIZEOF_OFF_T	    8
-#else
-#define SYSTEM_SIZEOF_OFF_T SIZEOF_OFF_T
-#endif /* USE_RAID */
-
-#if SIZEOF_OFF_T > 4
-typedef ulonglong my_off_t;
-#else
-typedef unsigned long my_off_t;
-#endif
-#define MY_FILEPOS_ERROR	(~(my_off_t) 0)
-#if !defined(__WIN__) && !defined(OS2)
-typedef off_t os_off_t;
-#endif
-
-#if defined(__WIN__)
-#define socket_errno	WSAGetLastError()
-#define SOCKET_EINTR	WSAEINTR
-#define SOCKET_EAGAIN	WSAEINPROGRESS
-#define SOCKET_ETIMEDOUT WSAETIMEDOUT
-#define SOCKET_EWOULDBLOCK WSAEWOULDBLOCK
-#define SOCKET_EADDRINUSE WSAEADDRINUSE
-#define SOCKET_ENFILE	ENFILE
-#define SOCKET_EMFILE	EMFILE
-#elif defined(OS2)
-#define socket_errno	sock_errno()
-#define SOCKET_EINTR	SOCEINTR
-#define SOCKET_EAGAIN	SOCEINPROGRESS
-#define SOCKET_ETIMEDOUT SOCKET_EINTR
-#define SOCKET_EWOULDBLOCK SOCEWOULDBLOCK
-#define SOCKET_EADDRINUSE SOCEADDRINUSE
-#define SOCKET_ENFILE	SOCENFILE
-#define SOCKET_EMFILE	SOCEMFILE
-#define closesocket(A)	soclose(A)
-#else /* Unix */
-#define socket_errno	errno
-#define closesocket(A)	close(A)
-#define SOCKET_EINTR	EINTR
-#define SOCKET_EAGAIN	EAGAIN
-#define SOCKET_ETIMEDOUT SOCKET_EINTR
-#define SOCKET_EWOULDBLOCK EWOULDBLOCK
-#define SOCKET_EADDRINUSE EADDRINUSE
-#define SOCKET_ENFILE	ENFILE
-#define SOCKET_EMFILE	EMFILE
-#endif
-
-typedef uint8		int7;	/* Most effective integer 0 <= x <= 127 */
-typedef short		int15;	/* Most effective integer 0 <= x <= 32767 */
-typedef char		*my_string; /* String of characters */
-typedef unsigned long	size_s; /* Size of strings (In string-funcs) */
-typedef int		myf;	/* Type of MyFlags in my_funcs */
-#ifndef byte_defined
-typedef char		byte;	/* Smallest addressable unit */
-#endif
-typedef char		my_bool; /* Small bool */
-#if !defined(bool) && !defined(bool_defined) && (!defined(HAVE_BOOL) || !defined(__cplusplus))
-typedef char		bool;	/* Ordinary boolean values 0 1 */
-#endif
-	/* Macros for converting *constants* to the right type */
-#define INT8(v)		(int8) (v)
-#define INT16(v)	(int16) (v)
-#define INT32(v)	(int32) (v)
-#define MYF(v)		(myf) (v)
-
-#ifndef LL
-#ifdef HAVE_LONG_LONG
-#define LL(A) A ## LL
-#else
-#define LL(A) A ## L
-#endif
-#endif
-
-#ifndef ULL
-#ifdef HAVE_LONG_LONG
-#define ULL(A) A ## ULL
-#else
-#define ULL(A) A ## UL
-#endif
-#endif
-
-/*
-  Defines to make it possible to prioritize register assignments. No
-  longer that important with modern compilers.
-*/
-#ifndef USING_X
-#define reg1 register
-#define reg2 register
-#define reg3 register
-#define reg4 register
-#define reg5 register
-#define reg6 register
-#define reg7 register
-#define reg8 register
-#define reg9 register
-#define reg10 register
-#define reg11 register
-#define reg12 register
-#define reg13 register
-#define reg14 register
-#define reg15 register
-#define reg16 register
-#endif
-
-/*
-  Sometimes we want to make sure that the variable is not put into
-  a register in debugging mode so we can see its value in the core
-*/
-
-#ifndef DBUG_OFF
-#define dbug_volatile volatile
-#else
-#define dbug_volatile
-#endif
-
-/* Defines for time function */
-#define SCALE_SEC	100
-#define SCALE_USEC	10000
-#define MY_HOW_OFTEN_TO_ALARM	2	/* How often we want info on screen */
-#define MY_HOW_OFTEN_TO_WRITE	1000	/* How often we want info on screen */
-
-#ifdef HAVE_TIMESPEC_TS_SEC
-#ifndef set_timespec
-#define set_timespec(ABSTIME,SEC) \
-{ \
-  (ABSTIME).ts_sec=time(0) + (time_t) (SEC); \
-  (ABSTIME).ts_nsec=0; \
-}
-#endif /* !set_timespec */
-#ifndef set_timespec_nsec
-#define set_timespec_nsec(ABSTIME,NSEC) \
-{ \
-  ulonglong now= my_getsystime() + (NSEC/100); \
-  (ABSTIME).ts_sec=  (now / ULL(10000000)); \
-  (ABSTIME).ts_nsec= (now % ULL(10000000) * 100 + ((NSEC) % 100)); \
-}
-#endif /* !set_timespec_nsec */
-#else
-#ifndef set_timespec
-#define set_timespec(ABSTIME,SEC) \
-{\
-  struct timeval tv;\
-  gettimeofday(&tv,0);\
-  (ABSTIME).tv_sec=tv.tv_sec+(time_t) (SEC);\
-  (ABSTIME).tv_nsec=tv.tv_usec*1000;\
-}
-#endif /* !set_timespec */
-#ifndef set_timespec_nsec
-#define set_timespec_nsec(ABSTIME,NSEC) \
-{\
-  ulonglong now= my_getsystime() + (NSEC/100); \
-  (ABSTIME).tv_sec=  (now / ULL(10000000)); \
-  (ABSTIME).tv_nsec= (now % ULL(10000000) * 100 + ((NSEC) % 100));    \
-}
-#endif /* !set_timespec_nsec */
-#endif /* HAVE_TIMESPEC_TS_SEC */
-
-/*
-  Define-funktions for reading and storing in machine independent format
-  (low byte first)
-*/
-
-/* Optimized store functions for Intel x86 */
-#if defined(__i386__) && !defined(_WIN64)
-#define sint2korr(A)	(*((int16 *) (A)))
-#define sint3korr(A)	((int32) ((((uchar) (A)[2]) & 128) ? \
-				  (((uint32) 255L << 24) | \
-				   (((uint32) (uchar) (A)[2]) << 16) |\
-				   (((uint32) (uchar) (A)[1]) << 8) | \
-				   ((uint32) (uchar) (A)[0])) : \
-				  (((uint32) (uchar) (A)[2]) << 16) |\
-				  (((uint32) (uchar) (A)[1]) << 8) | \
-				  ((uint32) (uchar) (A)[0])))
-#define sint4korr(A)	(*((long *) (A)))
-#define uint2korr(A)	(*((uint16 *) (A)))
-#ifdef HAVE_purify
-#define uint3korr(A)	(uint32) (((uint32) ((uchar) (A)[0])) +\
-				  (((uint32) ((uchar) (A)[1])) << 8) +\
-				  (((uint32) ((uchar) (A)[2])) << 16))
-#else
-/*
-   ATTENTION !
-   
-    Please, note, uint3korr reads 4 bytes (not 3) !
-    It means, that you have to provide enough allocated space !
-*/
-#define uint3korr(A)	(long) (*((unsigned int *) (A)) & 0xFFFFFF)
-#endif
-#define uint4korr(A)	(*((unsigned long *) (A)))
-#define uint5korr(A)	((ulonglong)(((uint32) ((uchar) (A)[0])) +\
-				    (((uint32) ((uchar) (A)[1])) << 8) +\
-				    (((uint32) ((uchar) (A)[2])) << 16) +\
-				    (((uint32) ((uchar) (A)[3])) << 24)) +\
-				    (((ulonglong) ((uchar) (A)[4])) << 32))
-#define uint8korr(A)	(*((ulonglong *) (A)))
-#define sint8korr(A)	(*((longlong *) (A)))
-#define int2store(T,A)	*((uint16*) (T))= (uint16) (A)
-#define int3store(T,A)  do { *(T)=  (uchar) ((A));\
-                            *(T+1)=(uchar) (((uint) (A) >> 8));\
-                            *(T+2)=(uchar) (((A) >> 16)); } while (0)
-#define int4store(T,A)	*((long *) (T))= (long) (A)
-#define int5store(T,A)  do { *(T)= (uchar)((A));\
-                             *((T)+1)=(uchar) (((A) >> 8));\
-                             *((T)+2)=(uchar) (((A) >> 16));\
-                             *((T)+3)=(uchar) (((A) >> 24)); \
-                             *((T)+4)=(uchar) (((A) >> 32)); } while(0)
-#define int8store(T,A)	*((ulonglong *) (T))= (ulonglong) (A)
-
-typedef union {
-  double v;
-  long m[2];
-} doubleget_union;
-#define doubleget(V,M)	\
-do { doubleget_union _tmp; \
-     _tmp.m[0] = *((long*)(M)); \
-     _tmp.m[1] = *(((long*) (M))+1); \
-     (V) = _tmp.v; } while(0)
-#define doublestore(T,V) do { *((long *) T) = ((doubleget_union *)&V)->m[0]; \
-			     *(((long *) T)+1) = ((doubleget_union *)&V)->m[1]; \
-                         } while (0)
-#define float4get(V,M) do { *((long *) &(V)) = *((long*) (M)); } while(0)
-#define float8get(V,M) doubleget((V),(M))
-#define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float))
-#define floatstore(T,V)  memcpy((byte*)(T), (byte*)(&V),sizeof(float))
-#define floatget(V,M)    memcpy((byte*) &V,(byte*) (M),sizeof(float))
-#define float8store(V,M) doublestore((V),(M))
-#endif /* __i386__ */
-
-#ifndef sint2korr
-/*
-  We're here if it's not a IA-32 architecture (Win32 and UNIX IA-32 defines
-  were done before)
-*/
-#define sint2korr(A)	(int16) (((int16) ((uchar) (A)[0])) +\
-				 ((int16) ((int16) (A)[1]) << 8))
-#define sint3korr(A)	((int32) ((((uchar) (A)[2]) & 128) ? \
-				  (((uint32) 255L << 24) | \
-				   (((uint32) (uchar) (A)[2]) << 16) |\
-				   (((uint32) (uchar) (A)[1]) << 8) | \
-				   ((uint32) (uchar) (A)[0])) : \
-				  (((uint32) (uchar) (A)[2]) << 16) |\
-				  (((uint32) (uchar) (A)[1]) << 8) | \
-				  ((uint32) (uchar) (A)[0])))
-#define sint4korr(A)	(int32) (((int32) ((uchar) (A)[0])) +\
-				(((int32) ((uchar) (A)[1]) << 8)) +\
-				(((int32) ((uchar) (A)[2]) << 16)) +\
-				(((int32) ((int16) (A)[3]) << 24)))
-#define sint8korr(A)	(longlong) uint8korr(A)
-#define uint2korr(A)	(uint16) (((uint16) ((uchar) (A)[0])) +\
-				  ((uint16) ((uchar) (A)[1]) << 8))
-#define uint3korr(A)	(uint32) (((uint32) ((uchar) (A)[0])) +\
-				  (((uint32) ((uchar) (A)[1])) << 8) +\
-				  (((uint32) ((uchar) (A)[2])) << 16))
-#define uint4korr(A)	(uint32) (((uint32) ((uchar) (A)[0])) +\
-				  (((uint32) ((uchar) (A)[1])) << 8) +\
-				  (((uint32) ((uchar) (A)[2])) << 16) +\
-				  (((uint32) ((uchar) (A)[3])) << 24))
-#define uint5korr(A)	((ulonglong)(((uint32) ((uchar) (A)[0])) +\
-				    (((uint32) ((uchar) (A)[1])) << 8) +\
-				    (((uint32) ((uchar) (A)[2])) << 16) +\
-				    (((uint32) ((uchar) (A)[3])) << 24)) +\
-				    (((ulonglong) ((uchar) (A)[4])) << 32))
-#define uint8korr(A)	((ulonglong)(((uint32) ((uchar) (A)[0])) +\
-				    (((uint32) ((uchar) (A)[1])) << 8) +\
-				    (((uint32) ((uchar) (A)[2])) << 16) +\
-				    (((uint32) ((uchar) (A)[3])) << 24)) +\
-			(((ulonglong) (((uint32) ((uchar) (A)[4])) +\
-				    (((uint32) ((uchar) (A)[5])) << 8) +\
-				    (((uint32) ((uchar) (A)[6])) << 16) +\
-				    (((uint32) ((uchar) (A)[7])) << 24))) <<\
-				    32))
-#define int2store(T,A)       do { uint def_temp= (uint) (A) ;\
-                                  *((uchar*) (T))=  (uchar)(def_temp); \
-                                   *((uchar*) (T)+1)=(uchar)((def_temp >> 8)); \
-                             } while(0)
-#define int3store(T,A)       do { /*lint -save -e734 */\
-                                  *((uchar*)(T))=(uchar) ((A));\
-                                  *((uchar*) (T)+1)=(uchar) (((A) >> 8));\
-                                  *((uchar*)(T)+2)=(uchar) (((A) >> 16)); \
-                                  /*lint -restore */} while(0)
-#define int4store(T,A)       do { *((char *)(T))=(char) ((A));\
-                                  *(((char *)(T))+1)=(char) (((A) >> 8));\
-                                  *(((char *)(T))+2)=(char) (((A) >> 16));\
-                                  *(((char *)(T))+3)=(char) (((A) >> 24)); } while(0)
-#define int5store(T,A)       do { *((char *)(T))=((A));\
-                                  *(((char *)(T))+1)=(((A) >> 8));\
-                                  *(((char *)(T))+2)=(((A) >> 16));\
-                                  *(((char *)(T))+3)=(((A) >> 24)); \
-                                  *(((char *)(T))+4)=(((A) >> 32)); } while(0)
-#define int8store(T,A)       do { uint def_temp= (uint) (A), def_temp2= (uint) ((A) >> 32); \
-                                  int4store((T),def_temp); \
-                                  int4store((T+4),def_temp2); } while(0)
-#ifdef WORDS_BIGENDIAN
-#define float4store(T,A) do { *(T)= ((byte *) &A)[3];\
-                              *((T)+1)=(char) ((byte *) &A)[2];\
-                              *((T)+2)=(char) ((byte *) &A)[1];\
-                              *((T)+3)=(char) ((byte *) &A)[0]; } while(0)
-
-#define float4get(V,M)   do { float def_temp;\
-                              ((byte*) &def_temp)[0]=(M)[3];\
-                              ((byte*) &def_temp)[1]=(M)[2];\
-                              ((byte*) &def_temp)[2]=(M)[1];\
-                              ((byte*) &def_temp)[3]=(M)[0];\
-                              (V)=def_temp; } while(0)
-#define float8store(T,V) do { *(T)= ((byte *) &V)[7];\
-                              *((T)+1)=(char) ((byte *) &V)[6];\
-                              *((T)+2)=(char) ((byte *) &V)[5];\
-                              *((T)+3)=(char) ((byte *) &V)[4];\
-                              *((T)+4)=(char) ((byte *) &V)[3];\
-                              *((T)+5)=(char) ((byte *) &V)[2];\
-                              *((T)+6)=(char) ((byte *) &V)[1];\
-                              *((T)+7)=(char) ((byte *) &V)[0]; } while(0)
-
-#define float8get(V,M)   do { double def_temp;\
-                              ((byte*) &def_temp)[0]=(M)[7];\
-                              ((byte*) &def_temp)[1]=(M)[6];\
-                              ((byte*) &def_temp)[2]=(M)[5];\
-                              ((byte*) &def_temp)[3]=(M)[4];\
-                              ((byte*) &def_temp)[4]=(M)[3];\
-                              ((byte*) &def_temp)[5]=(M)[2];\
-                              ((byte*) &def_temp)[6]=(M)[1];\
-                              ((byte*) &def_temp)[7]=(M)[0];\
-                              (V) = def_temp; } while(0)
-#else
-#define float4get(V,M)   memcpy_fixed((byte*) &V,(byte*) (M),sizeof(float))
-#define float4store(V,M) memcpy_fixed((byte*) V,(byte*) (&M),sizeof(float))
-
-#if defined(__FLOAT_WORD_ORDER) && (__FLOAT_WORD_ORDER == __BIG_ENDIAN)
-#define doublestore(T,V) do { *(((char*)T)+0)=(char) ((byte *) &V)[4];\
-                              *(((char*)T)+1)=(char) ((byte *) &V)[5];\
-                              *(((char*)T)+2)=(char) ((byte *) &V)[6];\
-                              *(((char*)T)+3)=(char) ((byte *) &V)[7];\
-                              *(((char*)T)+4)=(char) ((byte *) &V)[0];\
-                              *(((char*)T)+5)=(char) ((byte *) &V)[1];\
-                              *(((char*)T)+6)=(char) ((byte *) &V)[2];\
-                              *(((char*)T)+7)=(char) ((byte *) &V)[3]; }\
-                         while(0)
-#define doubleget(V,M)   do { double def_temp;\
-                              ((byte*) &def_temp)[0]=(M)[4];\
-                              ((byte*) &def_temp)[1]=(M)[5];\
-                              ((byte*) &def_temp)[2]=(M)[6];\
-                              ((byte*) &def_temp)[3]=(M)[7];\
-                              ((byte*) &def_temp)[4]=(M)[0];\
-                              ((byte*) &def_temp)[5]=(M)[1];\
-                              ((byte*) &def_temp)[6]=(M)[2];\
-                              ((byte*) &def_temp)[7]=(M)[3];\
-                              (V) = def_temp; } while(0)
-#endif /* __FLOAT_WORD_ORDER */
-
-#define float8get(V,M)   doubleget((V),(M))
-#define float8store(V,M) doublestore((V),(M))
-#endif /* WORDS_BIGENDIAN */
-
-#endif /* sint2korr */
-
-/*
-  Macro for reading 32-bit integer from network byte order (big-endian)
-  from unaligned memory location.
-*/
-#define int4net(A)        (int32) (((uint32) ((uchar) (A)[3]))        |\
-				  (((uint32) ((uchar) (A)[2])) << 8)  |\
-				  (((uint32) ((uchar) (A)[1])) << 16) |\
-				  (((uint32) ((uchar) (A)[0])) << 24))
-/*
-  Define-funktions for reading and storing in machine format from/to
-  short/long to/from some place in memory V should be a (not
-  register) variable, M is a pointer to byte
-*/
-
-#ifdef WORDS_BIGENDIAN
-
-#define ushortget(V,M)  do { V = (uint16) (((uint16) ((uchar) (M)[1]))+\
-                                 ((uint16) ((uint16) (M)[0]) << 8)); } while(0)
-#define shortget(V,M)   do { V = (short) (((short) ((uchar) (M)[1]))+\
-                                 ((short) ((short) (M)[0]) << 8)); } while(0)
-#define longget(V,M)    do { int32 def_temp;\
-                             ((byte*) &def_temp)[0]=(M)[0];\
-                             ((byte*) &def_temp)[1]=(M)[1];\
-                             ((byte*) &def_temp)[2]=(M)[2];\
-                             ((byte*) &def_temp)[3]=(M)[3];\
-                             (V)=def_temp; } while(0)
-#define ulongget(V,M)   do { uint32 def_temp;\
-                            ((byte*) &def_temp)[0]=(M)[0];\
-                            ((byte*) &def_temp)[1]=(M)[1];\
-                            ((byte*) &def_temp)[2]=(M)[2];\
-                            ((byte*) &def_temp)[3]=(M)[3];\
-                            (V)=def_temp; } while(0)
-#define shortstore(T,A) do { uint def_temp=(uint) (A) ;\
-                             *(((char*)T)+1)=(char)(def_temp); \
-                             *(((char*)T)+0)=(char)(def_temp >> 8); } while(0)
-#define longstore(T,A)  do { *(((char*)T)+3)=((A));\
-                             *(((char*)T)+2)=(((A) >> 8));\
-                             *(((char*)T)+1)=(((A) >> 16));\
-                             *(((char*)T)+0)=(((A) >> 24)); } while(0)
-
-#define floatget(V,M)    memcpy_fixed((byte*) &V,(byte*) (M),sizeof(float))
-#define floatstore(T,V)  memcpy_fixed((byte*) (T),(byte*)(&V),sizeof(float))
-#define doubleget(V,M)	 memcpy_fixed((byte*) &V,(byte*) (M),sizeof(double))
-#define doublestore(T,V) memcpy_fixed((byte*) (T),(byte*) &V,sizeof(double))
-#define longlongget(V,M) memcpy_fixed((byte*) &V,(byte*) (M),sizeof(ulonglong))
-#define longlongstore(T,V) memcpy_fixed((byte*) (T),(byte*) &V,sizeof(ulonglong))
-
-#else
-
-#define ushortget(V,M)	do { V = uint2korr(M); } while(0)
-#define shortget(V,M)	do { V = sint2korr(M); } while(0)
-#define longget(V,M)	do { V = sint4korr(M); } while(0)
-#define ulongget(V,M)   do { V = uint4korr(M); } while(0)
-#define shortstore(T,V) int2store(T,V)
-#define longstore(T,V)	int4store(T,V)
-#ifndef floatstore
-#define floatstore(T,V)  memcpy_fixed((byte*) (T),(byte*) (&V),sizeof(float))
-#define floatget(V,M)    memcpy_fixed((byte*) &V, (byte*) (M), sizeof(float))
-#endif
-#ifndef doubleget
-#define doubleget(V,M)	 memcpy_fixed((byte*) &V,(byte*) (M),sizeof(double))
-#define doublestore(T,V) memcpy_fixed((byte*) (T),(byte*) &V,sizeof(double))
-#endif /* doubleget */
-#define longlongget(V,M) memcpy_fixed((byte*) &V,(byte*) (M),sizeof(ulonglong))
-#define longlongstore(T,V) memcpy_fixed((byte*) (T),(byte*) &V,sizeof(ulonglong))
-
-#endif /* WORDS_BIGENDIAN */
-
-/* sprintf does not always return the number of bytes :- */
-#ifdef SPRINTF_RETURNS_INT
-#define my_sprintf(buff,args) sprintf args
-#else
-#ifdef SPRINTF_RETURNS_PTR
-#define my_sprintf(buff,args) ((int)(sprintf args - buff))
-#else
-#define my_sprintf(buff,args) ((ulong) sprintf args, (ulong) strlen(buff))
-#endif
-#endif
-
-#ifndef THREAD
-#define thread_safe_increment(V,L) (V)++
-#define thread_safe_add(V,C,L)     (V)+=(C)
-#define thread_safe_sub(V,C,L)     (V)-=(C)
-#define statistic_increment(V,L)   (V)++
-#define statistic_add(V,C,L)       (V)+=(C)
-#endif
-
-#ifdef HAVE_CHARSET_utf8
-#define MYSQL_UNIVERSAL_CLIENT_CHARSET "utf8"
-#else
-#define MYSQL_UNIVERSAL_CLIENT_CHARSET MYSQL_DEFAULT_CHARSET_NAME
-#endif
-
-#if defined(EMBEDDED_LIBRARY) && !defined(HAVE_EMBEDDED_PRIVILEGE_CONTROL)
-#define NO_EMBEDDED_ACCESS_CHECKS
-#endif
-
-#endif /* my_global_h */
diff --git a/src/mysql/my_list.h b/src/mysql/my_list.h
deleted file mode 100644
index 92598696f..000000000
--- a/src/mysql/my_list.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifndef _list_h_
-#define _list_h_
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-typedef struct st_list {
-  struct st_list *prev,*next;
-  void *data;
-} LIST;
-
-typedef int (*list_walk_action)(void *,void *);
-
-extern LIST *list_add(LIST *root,LIST *element);
-extern LIST *list_delete(LIST *root,LIST *element);
-extern LIST *list_cons(void *data,LIST *root);
-extern LIST *list_reverse(LIST *root);
-extern void list_free(LIST *root,unsigned int free_data);
-extern unsigned int list_length(LIST *);
-extern int list_walk(LIST *,list_walk_action action,gptr argument);
-
-#define list_rest(a) ((a)->next)
-#define list_push(a,b) (a)=list_cons((b),(a))
-#define list_pop(A) {LIST *old=(A); (A)=list_delete(old,old) ; my_free((gptr) old,MYF(MY_FAE)); }
-
-#ifdef	__cplusplus
-}
-#endif
-#endif
diff --git a/src/mysql/my_pthread.h b/src/mysql/my_pthread.h
deleted file mode 100644
index 202e047dc..000000000
--- a/src/mysql/my_pthread.h
+++ /dev/null
@@ -1,717 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/* Defines to make different thread packages compatible */
-
-#ifndef _my_pthread_h
-#define _my_pthread_h
-
-#include <errno.h>
-#ifndef ETIME
-#define ETIME ETIMEDOUT				/* For FreeBSD */
-#endif
-
-#ifdef  __cplusplus
-#define EXTERNC extern "C"
-extern "C" {
-#else
-#define EXTERNC
-#endif /* __cplusplus */ 
-
-#if defined(__WIN__) || defined(OS2)
-
-#ifdef OS2
-typedef ULONG     HANDLE;
-typedef ULONG     DWORD;
-typedef int sigset_t;
-#endif
-
-#ifdef OS2
-typedef HMTX             pthread_mutex_t;
-#else
-typedef CRITICAL_SECTION pthread_mutex_t;
-#endif
-typedef HANDLE		 pthread_t;
-typedef struct thread_attr {
-    DWORD dwStackSize ;
-    DWORD dwCreatingFlag ;
-    int priority ;
-} pthread_attr_t ;
-
-typedef struct { int dummy; } pthread_condattr_t;
-
-/* Implementation of posix conditions */
-
-typedef struct st_pthread_link {
-  DWORD thread_id;
-  struct st_pthread_link *next;
-} pthread_link;
-
-typedef struct {
-  uint32 waiting;
-#ifdef OS2
-  HEV    semaphore;
-#else
-  HANDLE semaphore;
-#endif
-} pthread_cond_t;
-
-
-#ifndef OS2
-struct timespec {		/* For pthread_cond_timedwait() */
-    time_t tv_sec;
-    long tv_nsec;
-};
-#endif
-
-typedef int pthread_mutexattr_t;
-#define win_pthread_self my_thread_var->pthread_self
-#ifdef OS2
-#define pthread_handler_t EXTERNC void * _Optlink
-typedef void * (_Optlink *pthread_handler)(void *);
-#else
-#define pthread_handler_t EXTERNC void * __cdecl
-typedef void * (__cdecl *pthread_handler)(void *);
-#endif
-
-void win_pthread_init(void);
-int win_pthread_setspecific(void *A,void *B,uint length);
-int pthread_create(pthread_t *,pthread_attr_t *,pthread_handler,void *);
-int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr);
-int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex);
-int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
-			   struct timespec *abstime);
-int pthread_cond_signal(pthread_cond_t *cond);
-int pthread_cond_broadcast(pthread_cond_t *cond);
-int pthread_cond_destroy(pthread_cond_t *cond);
-int pthread_attr_init(pthread_attr_t *connect_att);
-int pthread_attr_setstacksize(pthread_attr_t *connect_att,DWORD stack);
-int pthread_attr_setprio(pthread_attr_t *connect_att,int priority);
-int pthread_attr_destroy(pthread_attr_t *connect_att);
-struct tm *localtime_r(const time_t *timep,struct tm *tmp);
-struct tm *gmtime_r(const time_t *timep,struct tm *tmp);
-
-
-void pthread_exit(void *a);	 /* was #define pthread_exit(A) ExitThread(A)*/
-
-#ifndef OS2
-#define ETIMEDOUT 145		    /* Win32 doesn't have this */
-#define getpid() GetCurrentThreadId()
-#endif
-#define pthread_self() win_pthread_self
-#define HAVE_LOCALTIME_R		1
-#define _REENTRANT			1
-#define HAVE_PTHREAD_ATTR_SETSTACKSIZE	1
-
-#ifdef USE_TLS					/* For LIBMYSQL.DLL */
-#undef SAFE_MUTEX				/* This will cause conflicts */
-#define pthread_key(T,V)  DWORD V
-#define pthread_key_create(A,B) ((*A=TlsAlloc())==0xFFFFFFFF)
-#define pthread_key_delete(A) TlsFree(A)
-#define pthread_getspecific(A) (TlsGetValue(A))
-#define my_pthread_getspecific(T,A) ((T) TlsGetValue(A))
-#define my_pthread_getspecific_ptr(T,V) ((T) TlsGetValue(V))
-#define my_pthread_setspecific_ptr(T,V) (!TlsSetValue((T),(V)))
-#define pthread_setspecific(A,B) (!TlsSetValue((A),(B)))
-#else
-#define pthread_key(T,V) __declspec(thread) T V
-#define pthread_key_create(A,B) pthread_dummy(0)
-#define pthread_key_delete(A) pthread_dummy(0)
-#define pthread_getspecific(A) (&(A))
-#define my_pthread_getspecific(T,A) (&(A))
-#define my_pthread_getspecific_ptr(T,V) (V)
-#define my_pthread_setspecific_ptr(T,V) ((T)=(V),0)
-#define pthread_setspecific(A,B) win_pthread_setspecific(&(A),(B),sizeof(A))
-#endif /* USE_TLS */
-
-#define pthread_equal(A,B) ((A) == (B))
-#ifdef OS2
-extern int pthread_mutex_init (pthread_mutex_t *, const pthread_mutexattr_t *);
-extern int pthread_mutex_lock (pthread_mutex_t *);
-extern int pthread_mutex_unlock (pthread_mutex_t *);
-extern int pthread_mutex_destroy (pthread_mutex_t *);
-#define my_pthread_setprio(A,B)  DosSetPriority(PRTYS_THREAD,PRTYC_NOCHANGE, B, A)
-#define pthread_kill(A,B) raise(B)
-#define pthread_exit(A) pthread_dummy()
-#else
-#define pthread_mutex_init(A,B)  (InitializeCriticalSection(A),0)
-#define pthread_mutex_lock(A)	 (EnterCriticalSection(A),0)
-#define pthread_mutex_trylock(A) (WaitForSingleObject((A), 0) == WAIT_TIMEOUT)
-#define pthread_mutex_unlock(A)  LeaveCriticalSection(A)
-#define pthread_mutex_destroy(A) DeleteCriticalSection(A)
-#define my_pthread_setprio(A,B)  SetThreadPriority(GetCurrentThread(), (B))
-#define pthread_kill(A,B) pthread_dummy(0)
-#endif /* OS2 */
-
-/* Dummy defines for easier code */
-#define pthread_attr_setdetachstate(A,B) pthread_dummy(0)
-#define my_pthread_attr_setprio(A,B) pthread_attr_setprio(A,B)
-#define pthread_attr_setscope(A,B)
-#define pthread_detach_this_thread()
-#define pthread_condattr_init(A)
-#define pthread_condattr_destroy(A)
-
-/*Irena: compiler does not like this: */
-/*#define my_pthread_getprio(pthread_t thread_id) pthread_dummy(0) */
-#define my_pthread_getprio(thread_id) pthread_dummy(0)
-
-#elif defined(HAVE_UNIXWARE7_THREADS)
-
-#include <thread.h>
-#include <synch.h>
-
-#ifndef _REENTRANT
-#define _REENTRANT
-#endif
-
-#define HAVE_NONPOSIX_SIGWAIT
-#define pthread_t thread_t
-#define pthread_cond_t cond_t
-#define pthread_mutex_t mutex_t
-#define pthread_key_t thread_key_t
-typedef int pthread_attr_t;			/* Needed by Unixware 7.0.0 */
-
-#define pthread_key_create(A,B) thr_keycreate((A),(B))
-#define pthread_key_delete(A) thr_keydelete(A)
-
-#define pthread_handler_t EXTERNC void *
-#define pthread_key(T,V) pthread_key_t V
-
-void *	my_pthread_getspecific_imp(pthread_key_t key);
-#define my_pthread_getspecific(A,B) ((A) my_pthread_getspecific_imp(B))
-#define my_pthread_getspecific_ptr(T,V) my_pthread_getspecific(T,V)
-
-#define pthread_setspecific(A,B) thr_setspecific(A,B)
-#define my_pthread_setspecific_ptr(T,V) pthread_setspecific(T,V)
-
-#define pthread_create(A,B,C,D) thr_create(NULL,65536L,(C),(D),THR_DETACHED,(A))
-#define pthread_cond_init(a,b) cond_init((a),USYNC_THREAD,NULL)
-#define pthread_cond_destroy(a) cond_destroy(a)
-#define pthread_cond_signal(a) cond_signal(a)
-#define pthread_cond_wait(a,b) cond_wait((a),(b))
-#define pthread_cond_timedwait(a,b,c) cond_timedwait((a),(b),(c))
-#define pthread_cond_broadcast(a) cond_broadcast(a)
-
-#define pthread_mutex_init(a,b) mutex_init((a),USYNC_THREAD,NULL)
-#define pthread_mutex_lock(a) mutex_lock(a)
-#define pthread_mutex_unlock(a) mutex_unlock(a)
-#define pthread_mutex_destroy(a) mutex_destroy(a)
-
-#define pthread_self() thr_self()
-#define pthread_exit(A) thr_exit(A)
-#define pthread_equal(A,B) (((A) == (B)) ? 1 : 0)
-#define pthread_kill(A,B) thr_kill((A),(B))
-#define HAVE_PTHREAD_KILL
-
-#define pthread_sigmask(A,B,C) thr_sigsetmask((A),(B),(C))
-
-extern int my_sigwait(const sigset_t *set,int *sig);
-
-#define pthread_detach_this_thread() pthread_dummy(0)
-
-#define pthread_attr_init(A) pthread_dummy(0)
-#define pthread_attr_destroy(A) pthread_dummy(0)
-#define pthread_attr_setscope(A,B) pthread_dummy(0)
-#define pthread_attr_setdetachstate(A,B) pthread_dummy(0)
-#define my_pthread_setprio(A,B) pthread_dummy (0)
-#define my_pthread_getprio(A) pthread_dummy (0)
-#define my_pthread_attr_setprio(A,B) pthread_dummy(0)
-
-#else /* Normal threads */
-
-#ifdef HAVE_rts_threads
-#define sigwait org_sigwait
-#include <signal.h>
-#undef sigwait
-#endif
-#include <pthread.h>
-#ifndef _REENTRANT
-#define _REENTRANT
-#endif
-#ifdef HAVE_THR_SETCONCURRENCY
-#include <thread.h>			/* Probably solaris */
-#endif
-#ifdef HAVE_SCHED_H
-#include <sched.h>
-#endif
-#ifdef HAVE_SYNCH_H
-#include <synch.h>
-#endif
-#if defined(__EMX__) && (!defined(EMX_PTHREAD_REV) || (EMX_PTHREAD_REV < 2))
-#error Requires at least rev 2 of EMX pthreads library.
-#endif
-
-#ifdef __NETWARE__
-void my_pthread_exit(void *status);
-#define pthread_exit(A) my_pthread_exit(A)
-#endif
-
-extern int my_pthread_getprio(pthread_t thread_id);
-
-#define pthread_key(T,V) pthread_key_t V
-#define my_pthread_getspecific_ptr(T,V) my_pthread_getspecific(T,(V))
-#define my_pthread_setspecific_ptr(T,V) pthread_setspecific(T,(void*) (V))
-#define pthread_detach_this_thread()
-#define pthread_handler_t EXTERNC void *
-typedef void *(* pthread_handler)(void *);
-
-/* Test first for RTS or FSU threads */
-
-#if defined(PTHREAD_SCOPE_GLOBAL) && !defined(PTHREAD_SCOPE_SYSTEM)
-#define HAVE_rts_threads
-extern int my_pthread_create_detached;
-#define pthread_sigmask(A,B,C) sigprocmask((A),(B),(C))
-#define PTHREAD_CREATE_DETACHED &my_pthread_create_detached
-#define PTHREAD_SCOPE_SYSTEM  PTHREAD_SCOPE_GLOBAL
-#define PTHREAD_SCOPE_PROCESS PTHREAD_SCOPE_LOCAL
-#define USE_ALARM_THREAD
-#elif defined(HAVE_mit_thread)
-#define USE_ALARM_THREAD
-#undef	HAVE_LOCALTIME_R
-#define HAVE_LOCALTIME_R
-#undef	HAVE_GMTIME_R
-#define HAVE_GMTIME_R
-#undef	HAVE_PTHREAD_ATTR_SETSCOPE
-#define HAVE_PTHREAD_ATTR_SETSCOPE
-#undef HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE	/* If we are running linux */
-#undef HAVE_RWLOCK_T
-#undef HAVE_RWLOCK_INIT
-#undef HAVE_PTHREAD_RWLOCK_RDLOCK
-#undef HAVE_SNPRINTF
-
-#define my_pthread_attr_setprio(A,B)
-#endif /* defined(PTHREAD_SCOPE_GLOBAL) && !defined(PTHREAD_SCOPE_SYSTEM) */
-
-#if defined(_BSDI_VERSION) && _BSDI_VERSION < 199910
-int sigwait(sigset_t *set, int *sig);
-#endif
-
-#ifndef HAVE_NONPOSIX_SIGWAIT
-#define my_sigwait(A,B) sigwait((A),(B))
-#else
-int my_sigwait(const sigset_t *set,int *sig);
-#endif
-
-#ifdef HAVE_NONPOSIX_PTHREAD_MUTEX_INIT
-#ifndef SAFE_MUTEX
-#define pthread_mutex_init(a,b) my_pthread_mutex_init((a),(b))
-extern int my_pthread_mutex_init(pthread_mutex_t *mp,
-				 const pthread_mutexattr_t *attr);
-#endif /* SAFE_MUTEX */
-#define pthread_cond_init(a,b) my_pthread_cond_init((a),(b))
-extern int my_pthread_cond_init(pthread_cond_t *mp,
-				const pthread_condattr_t *attr);
-#endif /* HAVE_NONPOSIX_PTHREAD_MUTEX_INIT */
-
-#if defined(HAVE_SIGTHREADMASK) && !defined(HAVE_PTHREAD_SIGMASK)
-#define pthread_sigmask(A,B,C) sigthreadmask((A),(B),(C))
-#endif
-
-#if !defined(HAVE_SIGWAIT) && !defined(HAVE_mit_thread) && !defined(HAVE_rts_threads) && !defined(sigwait) && !defined(alpha_linux_port) && !defined(HAVE_NONPOSIX_SIGWAIT) && !defined(HAVE_DEC_3_2_THREADS) && !defined(_AIX)
-int sigwait(sigset_t *setp, int *sigp);		/* Use our implemention */
-#endif
-
-
-/*
-  We define my_sigset() and use that instead of the system sigset() so that
-  we can favor an implementation based on sigaction(). On some systems, such
-  as Mac OS X, sigset() results in flags such as SA_RESTART being set, and
-  we want to make sure that no such flags are set.
-*/
-#if defined(HAVE_SIGACTION) && !defined(my_sigset)
-#define my_sigset(A,B) do { struct sigaction s; sigset_t set;              \
-                            sigemptyset(&set);                             \
-                            s.sa_handler = (B);                            \
-                            s.sa_mask    = set;                            \
-                            s.sa_flags   = 0;                              \
-                            sigaction((A), &s, (struct sigaction *) NULL); \
-                          } while (0)
-#elif defined(HAVE_SIGSET) && !defined(my_sigset)
-#define my_sigset(A,B) sigset((A),(B))
-#elif !defined(my_sigset)
-#define my_sigset(A,B) signal((A),(B))
-#endif
-
-#ifndef my_pthread_setprio
-#if defined(HAVE_PTHREAD_SETPRIO_NP)		/* FSU threads */
-#define my_pthread_setprio(A,B) pthread_setprio_np((A),(B))
-#elif defined(HAVE_PTHREAD_SETPRIO)
-#define my_pthread_setprio(A,B) pthread_setprio((A),(B))
-#else
-extern void my_pthread_setprio(pthread_t thread_id,int prior);
-#endif
-#endif
-
-#ifndef my_pthread_attr_setprio
-#ifdef HAVE_PTHREAD_ATTR_SETPRIO
-#define my_pthread_attr_setprio(A,B) pthread_attr_setprio((A),(B))
-#else
-extern void my_pthread_attr_setprio(pthread_attr_t *attr, int priority);
-#endif
-#endif
-
-#if !defined(HAVE_PTHREAD_ATTR_SETSCOPE) || defined(HAVE_DEC_3_2_THREADS)
-#define pthread_attr_setscope(A,B)
-#undef	HAVE_GETHOSTBYADDR_R			/* No definition */
-#endif
-
-#if defined(HAVE_BROKEN_PTHREAD_COND_TIMEDWAIT) && !defined(SAFE_MUTEX)
-extern int my_pthread_cond_timedwait(pthread_cond_t *cond,
-				     pthread_mutex_t *mutex,
-				     struct timespec *abstime);
-#define pthread_cond_timedwait(A,B,C) my_pthread_cond_timedwait((A),(B),(C))
-#endif
-
-#if defined(OS2)
-#define my_pthread_getspecific(T,A) ((T) &(A))
-#define pthread_setspecific(A,B) win_pthread_setspecific(&(A),(B),sizeof(A))
-#elif !defined( HAVE_NONPOSIX_PTHREAD_GETSPECIFIC)
-#define my_pthread_getspecific(A,B) ((A) pthread_getspecific(B))
-#else
-#define my_pthread_getspecific(A,B) ((A) my_pthread_getspecific_imp(B))
-void *my_pthread_getspecific_imp(pthread_key_t key);
-#endif /* OS2 */
-
-#ifndef HAVE_LOCALTIME_R
-struct tm *localtime_r(const time_t *clock, struct tm *res);
-#endif
-
-#ifndef HAVE_GMTIME_R
-struct tm *gmtime_r(const time_t *clock, struct tm *res);
-#endif
-
-#ifdef HAVE_PTHREAD_CONDATTR_CREATE
-/* DCE threads on HPUX 10.20 */
-#define pthread_condattr_init pthread_condattr_create
-#define pthread_condattr_destroy pthread_condattr_delete
-#endif
-
-/* FSU THREADS */
-#if !defined(HAVE_PTHREAD_KEY_DELETE) && !defined(pthread_key_delete)
-#define pthread_key_delete(A) pthread_dummy(0)
-#endif
-
-#ifdef HAVE_CTHREADS_WRAPPER			/* For MacOSX */
-#define pthread_cond_destroy(A) pthread_dummy(0)
-#define pthread_mutex_destroy(A) pthread_dummy(0)
-#define pthread_attr_delete(A) pthread_dummy(0)
-#define pthread_condattr_delete(A) pthread_dummy(0)
-#define pthread_attr_setstacksize(A,B) pthread_dummy(0)
-#define pthread_equal(A,B) ((A) == (B))
-#define pthread_cond_timedwait(a,b,c) pthread_cond_wait((a),(b))
-#define pthread_attr_init(A) pthread_attr_create(A)
-#define pthread_attr_destroy(A) pthread_attr_delete(A)
-#define pthread_attr_setdetachstate(A,B) pthread_dummy(0)
-#define pthread_create(A,B,C,D) pthread_create((A),*(B),(C),(D))
-#define pthread_sigmask(A,B,C) sigprocmask((A),(B),(C))
-#define pthread_kill(A,B) pthread_dummy(0)
-#undef	pthread_detach_this_thread
-#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(&tmp); }
-#endif
-
-#ifdef HAVE_DARWIN5_THREADS
-#define pthread_sigmask(A,B,C) sigprocmask((A),(B),(C))
-#define pthread_kill(A,B) pthread_dummy(0)
-#define pthread_condattr_init(A) pthread_dummy(0)
-#define pthread_condattr_destroy(A) pthread_dummy(0)
-#undef	pthread_detach_this_thread
-#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(tmp); }
-#endif
-
-#if ((defined(HAVE_PTHREAD_ATTR_CREATE) && !defined(HAVE_SIGWAIT)) || defined(HAVE_DEC_3_2_THREADS)) && !defined(HAVE_CTHREADS_WRAPPER)
-/* This is set on AIX_3_2 and Siemens unix (and DEC OSF/1 3.2 too) */
-#define pthread_key_create(A,B) \
-		pthread_keycreate(A,(B) ?\
-				  (pthread_destructor_t) (B) :\
-				  (pthread_destructor_t) pthread_dummy)
-#define pthread_attr_init(A) pthread_attr_create(A)
-#define pthread_attr_destroy(A) pthread_attr_delete(A)
-#define pthread_attr_setdetachstate(A,B) pthread_dummy(0)
-#define pthread_create(A,B,C,D) pthread_create((A),*(B),(C),(D))
-#ifndef pthread_sigmask
-#define pthread_sigmask(A,B,C) sigprocmask((A),(B),(C))
-#endif
-#define pthread_kill(A,B) pthread_dummy(0)
-#undef	pthread_detach_this_thread
-#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(&tmp); }
-#elif !defined(__NETWARE__) /* HAVE_PTHREAD_ATTR_CREATE && !HAVE_SIGWAIT */
-#define HAVE_PTHREAD_KILL
-#endif
-
-#endif /* defined(__WIN__) */
-
-#if defined(HPUX10) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS)
-#undef pthread_cond_timedwait
-#define pthread_cond_timedwait(a,b,c) my_pthread_cond_timedwait((a),(b),(c))
-int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
-			      struct timespec *abstime);
-#endif
-
-#if defined(HPUX10)
-#define pthread_attr_getstacksize(A,B) my_pthread_attr_getstacksize(A,B)
-void my_pthread_attr_getstacksize(pthread_attr_t *attrib, size_t *size);
-#endif
-
-#if defined(HAVE_POSIX1003_4a_MUTEX) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS)
-#undef pthread_mutex_trylock
-#define pthread_mutex_trylock(a) my_pthread_mutex_trylock((a))
-int my_pthread_mutex_trylock(pthread_mutex_t *mutex);
-#endif
-
-	/* safe_mutex adds checking to mutex for easier debugging */
-
-#if defined(__NETWARE__) && !defined(SAFE_MUTEX_DETECT_DESTROY)
-#define SAFE_MUTEX_DETECT_DESTROY
-#endif
-
-typedef struct st_safe_mutex_t
-{
-  pthread_mutex_t global,mutex;
-  const char *file;
-  uint line,count;
-  pthread_t thread;
-#ifdef SAFE_MUTEX_DETECT_DESTROY
-  struct st_safe_mutex_info_t *info;	/* to track destroying of mutexes */
-#endif
-} safe_mutex_t;
-
-#ifdef SAFE_MUTEX_DETECT_DESTROY
-/*
-  Used to track the destroying of mutexes. This needs to be a seperate
-  structure because the safe_mutex_t structure could be freed before
-  the mutexes are destroyed.
-*/
-
-typedef struct st_safe_mutex_info_t
-{
-  struct st_safe_mutex_info_t *next;
-  struct st_safe_mutex_info_t *prev;
-  const char *init_file;
-  uint32 init_line;
-} safe_mutex_info_t;
-#endif /* SAFE_MUTEX_DETECT_DESTROY */
-
-int safe_mutex_init(safe_mutex_t *mp, const pthread_mutexattr_t *attr,
-                    const char *file, uint line);
-int safe_mutex_lock(safe_mutex_t *mp,const char *file, uint line);
-int safe_mutex_unlock(safe_mutex_t *mp,const char *file, uint line);
-int safe_mutex_destroy(safe_mutex_t *mp,const char *file, uint line);
-int safe_cond_wait(pthread_cond_t *cond, safe_mutex_t *mp,const char *file,
-		   uint line);
-int safe_cond_timedwait(pthread_cond_t *cond, safe_mutex_t *mp,
-			struct timespec *abstime, const char *file, uint line);
-void safe_mutex_global_init(void);
-void safe_mutex_end(FILE *file);
-
-	/* Wrappers if safe mutex is actually used */
-#ifdef SAFE_MUTEX
-#undef pthread_mutex_init
-#undef pthread_mutex_lock
-#undef pthread_mutex_unlock
-#undef pthread_mutex_destroy
-#undef pthread_mutex_wait
-#undef pthread_mutex_timedwait
-#undef pthread_mutex_t
-#undef pthread_cond_wait
-#undef pthread_cond_timedwait
-#undef pthread_mutex_trylock
-#define pthread_mutex_init(A,B) safe_mutex_init((A),(B),__FILE__,__LINE__)
-#define pthread_mutex_lock(A) safe_mutex_lock((A),__FILE__,__LINE__)
-#define pthread_mutex_unlock(A) safe_mutex_unlock((A),__FILE__,__LINE__)
-#define pthread_mutex_destroy(A) safe_mutex_destroy((A),__FILE__,__LINE__)
-#define pthread_cond_wait(A,B) safe_cond_wait((A),(B),__FILE__,__LINE__)
-#define pthread_cond_timedwait(A,B,C) safe_cond_timedwait((A),(B),(C),__FILE__,__LINE__)
-#define pthread_mutex_trylock(A) pthread_mutex_lock(A)
-#define pthread_mutex_t safe_mutex_t
-#define safe_mutex_assert_owner(mp) \
-          DBUG_ASSERT((mp)->count > 0 && \
-                      pthread_equal(pthread_self(), (mp)->thread))
-#define safe_mutex_assert_not_owner(mp) \
-          DBUG_ASSERT(! (mp)->count || \
-                      ! pthread_equal(pthread_self(), (mp)->thread))
-#else
-#define safe_mutex_assert_owner(mp)
-#define safe_mutex_assert_not_owner(mp)
-#endif /* SAFE_MUTEX */
-
-	/* READ-WRITE thread locking */
-
-#ifdef HAVE_BROKEN_RWLOCK			/* For OpenUnix */
-#undef HAVE_PTHREAD_RWLOCK_RDLOCK
-#undef HAVE_RWLOCK_INIT
-#undef HAVE_RWLOCK_T
-#endif
-
-#if defined(USE_MUTEX_INSTEAD_OF_RW_LOCKS)
-/* use these defs for simple mutex locking */
-#define rw_lock_t pthread_mutex_t
-#define my_rwlock_init(A,B) pthread_mutex_init((A),(B))
-#define rw_rdlock(A) pthread_mutex_lock((A))
-#define rw_wrlock(A) pthread_mutex_lock((A))
-#define rw_tryrdlock(A) pthread_mutex_trylock((A))
-#define rw_trywrlock(A) pthread_mutex_trylock((A))
-#define rw_unlock(A) pthread_mutex_unlock((A))
-#define rwlock_destroy(A) pthread_mutex_destroy((A))
-#elif defined(HAVE_PTHREAD_RWLOCK_RDLOCK)
-#define rw_lock_t pthread_rwlock_t
-#define my_rwlock_init(A,B) pthread_rwlock_init((A),(B))
-#define rw_rdlock(A) pthread_rwlock_rdlock(A)
-#define rw_wrlock(A) pthread_rwlock_wrlock(A)
-#define rw_tryrdlock(A) pthread_rwlock_tryrdlock((A))
-#define rw_trywrlock(A) pthread_rwlock_trywrlock((A))
-#define rw_unlock(A) pthread_rwlock_unlock(A)
-#define rwlock_destroy(A) pthread_rwlock_destroy(A)
-#elif defined(HAVE_RWLOCK_INIT)
-#ifdef HAVE_RWLOCK_T				/* For example Solaris 2.6-> */
-#define rw_lock_t rwlock_t
-#endif
-#define my_rwlock_init(A,B) rwlock_init((A),USYNC_THREAD,0)
-#else
-/* Use our own version of read/write locks */
-typedef struct _my_rw_lock_t {
-	pthread_mutex_t lock;		/* lock for structure		*/
-	pthread_cond_t	readers;	/* waiting readers		*/
-	pthread_cond_t	writers;	/* waiting writers		*/
-	int		state;		/* -1:writer,0:free,>0:readers	*/
-	int		waiters;	/* number of waiting writers	*/
-} my_rw_lock_t;
-
-#define rw_lock_t my_rw_lock_t
-#define rw_rdlock(A) my_rw_rdlock((A))
-#define rw_wrlock(A) my_rw_wrlock((A))
-#define rw_tryrdlock(A) my_rw_tryrdlock((A))
-#define rw_trywrlock(A) my_rw_trywrlock((A))
-#define rw_unlock(A) my_rw_unlock((A))
-#define rwlock_destroy(A) my_rwlock_destroy((A))
-
-extern int my_rwlock_init(my_rw_lock_t *, void *);
-extern int my_rwlock_destroy(my_rw_lock_t *);
-extern int my_rw_rdlock(my_rw_lock_t *);
-extern int my_rw_wrlock(my_rw_lock_t *);
-extern int my_rw_unlock(my_rw_lock_t *);
-extern int my_rw_tryrdlock(my_rw_lock_t *);
-extern int my_rw_trywrlock(my_rw_lock_t *);
-#endif /* USE_MUTEX_INSTEAD_OF_RW_LOCKS */
-
-#define GETHOSTBYADDR_BUFF_SIZE 2048
-
-#ifndef HAVE_THR_SETCONCURRENCY
-#define thr_setconcurrency(A) pthread_dummy(0)
-#endif
-#if !defined(HAVE_PTHREAD_ATTR_SETSTACKSIZE) && ! defined(pthread_attr_setstacksize)
-#define pthread_attr_setstacksize(A,B) pthread_dummy(0)
-#endif
-
-/* Define mutex types, see my_thr_init.c */
-#define MY_MUTEX_INIT_SLOW   NULL
-#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
-extern pthread_mutexattr_t my_fast_mutexattr;
-#define MY_MUTEX_INIT_FAST &my_fast_mutexattr
-#else
-#define MY_MUTEX_INIT_FAST   NULL
-#endif
-#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
-extern pthread_mutexattr_t my_errorcheck_mutexattr;
-#define MY_MUTEX_INIT_ERRCHK &my_errorcheck_mutexattr
-#else
-#define MY_MUTEX_INIT_ERRCHK   NULL
-#endif
-
-extern my_bool my_thread_global_init(void);
-extern void my_thread_global_end(void);
-extern my_bool my_thread_init(void);
-extern void my_thread_end(void);
-extern const char *my_thread_name(void);
-extern long my_thread_id(void);
-extern int pthread_no_free(void *);
-extern int pthread_dummy(int);
-
-/* All thread specific variables are in the following struct */
-
-#define THREAD_NAME_SIZE 10
-#ifndef DEFAULT_THREAD_STACK
-#if SIZEOF_CHARP > 4
-/*
-  MySQL can survive with 32K, but some glibc libraries require > 128K stack
-  To resolve hostnames. Also recursive stored procedures needs stack.
-*/
-#define DEFAULT_THREAD_STACK	(256*1024L)
-#else
-#define DEFAULT_THREAD_STACK	(192*1024)
-#endif
-#endif
-
-struct st_my_thread_var
-{
-  int thr_errno;
-  pthread_cond_t suspend;
-  pthread_mutex_t mutex;
-  pthread_mutex_t * volatile current_mutex;
-  pthread_cond_t * volatile current_cond;
-  pthread_t pthread_self;
-  long id;
-  int cmp_length;
-  int volatile abort;
-  my_bool init;
-  struct st_my_thread_var *next,**prev;
-  void *opt_info;
-#ifndef DBUG_OFF
-  gptr dbug;
-  char name[THREAD_NAME_SIZE+1];
-#endif
-};
-
-extern struct st_my_thread_var *_my_thread_var(void) __attribute__ ((const));
-#define my_thread_var (_my_thread_var())
-#define my_errno my_thread_var->thr_errno
-/*
-  Keep track of shutdown,signal, and main threads so that my_end() will not
-  report errors with them
-*/
-extern pthread_t shutdown_th, main_th, signal_th;
-
-	/* statistics_xxx functions are for not essential statistic */
-
-#ifndef thread_safe_increment
-#ifdef HAVE_ATOMIC_ADD
-#define thread_safe_increment(V,L) atomic_inc((atomic_t*) &V)
-#define thread_safe_decrement(V,L) atomic_dec((atomic_t*) &V)
-#define thread_safe_add(V,C,L)     atomic_add((C),(atomic_t*) &V)
-#define thread_safe_sub(V,C,L)     atomic_sub((C),(atomic_t*) &V)
-#else
-#define thread_safe_increment(V,L) \
-        (pthread_mutex_lock((L)), (V)++, pthread_mutex_unlock((L)))
-#define thread_safe_decrement(V,L) \
-        (pthread_mutex_lock((L)), (V)--, pthread_mutex_unlock((L)))
-#define thread_safe_add(V,C,L) (pthread_mutex_lock((L)), (V)+=(C), pthread_mutex_unlock((L)))
-#define thread_safe_sub(V,C,L) \
-        (pthread_mutex_lock((L)), (V)-=(C), pthread_mutex_unlock((L)))
-#endif /* HAVE_ATOMIC_ADD */
-#ifdef SAFE_STATISTICS
-#define statistic_increment(V,L)   thread_safe_increment((V),(L))
-#define statistic_decrement(V,L)   thread_safe_decrement((V),(L))
-#define statistic_add(V,C,L)       thread_safe_add((V),(C),(L))
-#else
-#define statistic_decrement(V,L) (V)--
-#define statistic_increment(V,L) (V)++
-#define statistic_add(V,C,L)     (V)+=(C)
-#endif /* SAFE_STATISTICS */
-#endif /* thread_safe_increment */
-
-#ifdef  __cplusplus
-}
-#endif
-#endif /* _my_ptread_h */
diff --git a/src/mysql/my_sys.h b/src/mysql/my_sys.h
deleted file mode 100644
index 44fe383bf..000000000
--- a/src/mysql/my_sys.h
+++ /dev/null
@@ -1,904 +0,0 @@
-/* Copyright (C) 2000-2003 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifndef _my_sys_h
-#define _my_sys_h
-C_MODE_START
-
-#ifdef HAVE_AIOWAIT
-#include <sys/asynch.h>			/* Used by record-cache */
-typedef struct my_aio_result {
-  aio_result_t result;
-  int	       pending;
-} my_aio_result;
-#endif
-
-#ifndef THREAD
-extern int NEAR my_errno;		/* Last error in mysys */
-#else
-#include <my_pthread.h>
-#endif
-
-#ifndef _m_ctype_h
-#include <m_ctype.h>                    /* for CHARSET_INFO */
-#endif
-
-#include <stdarg.h>
-#include <typelib.h>
-
-#define MYSYS_PROGRAM_USES_CURSES()  { error_handler_hook = my_message_curses;	mysys_uses_curses=1; }
-#define MYSYS_PROGRAM_DONT_USE_CURSES()  { error_handler_hook = my_message_no_curses; mysys_uses_curses=0;}
-#define MY_INIT(name);		{ my_progname= name; my_init(); }
-
-#define ERRMSGSIZE	(SC_MAXWIDTH)	/* Max length of a error message */
-#define NRERRBUFFS	(2)	/* Buffers for parameters */
-#define MY_FILE_ERROR	((uint) ~0)
-
-	/* General bitmaps for my_func's */
-#define MY_FFNF		1	/* Fatal if file not found */
-#define MY_FNABP	2	/* Fatal if not all bytes read/writen */
-#define MY_NABP		4	/* Error if not all bytes read/writen */
-#define MY_FAE		8	/* Fatal if any error */
-#define MY_WME		16	/* Write message on error */
-#define MY_WAIT_IF_FULL 32	/* Wait and try again if disk full error */
-#define MY_IGNORE_BADFD 32      /* my_sync: ignore 'bad descriptor' errors */
-#define MY_RAID         64      /* Support for RAID */
-#define MY_FULL_IO     512      /* For my_read - loop intil I/O is complete */
-#define MY_DONT_CHECK_FILESIZE 128 /* Option to init_io_cache() */
-#define MY_LINK_WARNING 32	/* my_redel() gives warning if links */
-#define MY_COPYTIME	64	/* my_redel() copys time */
-#define MY_DELETE_OLD	256	/* my_create_with_symlink() */
-#define MY_RESOLVE_LINK 128	/* my_realpath(); Only resolve links */
-#define MY_HOLD_ORIGINAL_MODES 128  /* my_copy() holds to file modes */
-#define MY_REDEL_MAKE_BACKUP 256
-#define MY_SEEK_NOT_DONE 32	/* my_lock may have to do a seek */
-#define MY_DONT_WAIT	64	/* my_lock() don't wait if can't lock */
-#define MY_ZEROFILL	32	/* my_malloc(), fill array with zero */
-#define MY_ALLOW_ZERO_PTR 64	/* my_realloc() ; zero ptr -> malloc */
-#define MY_FREE_ON_ERROR 128	/* my_realloc() ; Free old ptr on error */
-#define MY_HOLD_ON_ERROR 256	/* my_realloc() ; Return old ptr on error */
-#define MY_THREADSAFE	128	/* pread/pwrite:  Don't allow interrupts */
-#define MY_DONT_OVERWRITE_FILE 1024	/* my_copy: Don't overwrite file */
-
-#define MY_CHECK_ERROR	1	/* Params to my_end; Check open-close */
-#define MY_GIVE_INFO	2	/* Give time info about process*/
-
-#define ME_HIGHBYTE	8	/* Shift for colours */
-#define ME_NOCUR	1	/* Don't use curses message */
-#define ME_OLDWIN	2	/* Use old window */
-#define ME_BELL		4	/* Ring bell then printing message */
-#define ME_HOLDTANG	8	/* Don't delete last keys */
-#define ME_WAITTOT	16	/* Wait for errtime secs of for a action */
-#define ME_WAITTANG	32	/* Wait for a user action  */
-#define ME_NOREFRESH	64	/* Dont refresh screen */
-#define ME_NOINPUT	128	/* Dont use the input libary */
-#define ME_COLOUR1	((1 << ME_HIGHBYTE))	/* Possibly error-colours */
-#define ME_COLOUR2	((2 << ME_HIGHBYTE))
-#define ME_COLOUR3	((3 << ME_HIGHBYTE))
-
-	/* Bits in last argument to fn_format */
-#define MY_REPLACE_DIR		1	/* replace dir in name with 'dir' */
-#define MY_REPLACE_EXT		2	/* replace extension with 'ext' */
-#define MY_UNPACK_FILENAME	4	/* Unpack name (~ -> home) */
-#define MY_PACK_FILENAME	8	/* Pack name (home -> ~) */
-#define MY_RESOLVE_SYMLINKS	16	/* Resolve all symbolic links */
-#define MY_RETURN_REAL_PATH	32	/* return full path for file */
-#define MY_SAFE_PATH		64	/* Return NULL if too long path */
-#define MY_RELATIVE_PATH	128	/* name is relative to 'dir' */
-
-	/* My seek flags */
-#define MY_SEEK_SET	0
-#define MY_SEEK_CUR	1
-#define MY_SEEK_END	2
-
-	/* Some constants */
-#define MY_WAIT_FOR_USER_TO_FIX_PANIC	60	/* in seconds */
-#define MY_WAIT_GIVE_USER_A_MESSAGE	10	/* Every 10 times of prev */
-#define MIN_COMPRESS_LENGTH		50	/* Don't compress small bl. */
-#define DFLT_INIT_HITS  3
-
-	/* root_alloc flags */
-#define MY_KEEP_PREALLOC	1
-#define MY_MARK_BLOCKS_FREE     2  /* move used to free list and reuse them */
-
-	/* Internal error numbers (for assembler functions) */
-#define MY_ERRNO_EDOM		33
-#define MY_ERRNO_ERANGE		34
-
-	/* Bits for get_date timeflag */
-#define GETDATE_DATE_TIME	1
-#define GETDATE_SHORT_DATE	2
-#define GETDATE_HHMMSSTIME	4
-#define GETDATE_GMT		8
-#define GETDATE_FIXEDLENGTH	16
-
-	/* defines when allocating data */
-#ifdef SAFEMALLOC
-#define my_malloc(SZ,FLAG) _mymalloc((SZ), __FILE__, __LINE__, FLAG )
-#define my_malloc_ci(SZ,FLAG) _mymalloc((SZ), sFile, uLine, FLAG )
-#define my_realloc(PTR,SZ,FLAG) _myrealloc((PTR), (SZ), __FILE__, __LINE__, FLAG )
-#define my_checkmalloc() _sanity( __FILE__, __LINE__ )
-#define my_free(PTR,FLAG) _myfree((PTR), __FILE__, __LINE__,FLAG)
-#define my_memdup(A,B,C) _my_memdup((A),(B), __FILE__,__LINE__,C)
-#define my_strdup(A,C) _my_strdup((A), __FILE__,__LINE__,C)
-#define my_strdup_with_length(A,B,C) _my_strdup_with_length((A),(B),__FILE__,__LINE__,C)
-#define TRASH(A,B) bfill(A, B, 0x8F)
-#define QUICK_SAFEMALLOC sf_malloc_quick=1
-#define NORMAL_SAFEMALLOC sf_malloc_quick=0
-extern uint sf_malloc_prehunc,sf_malloc_endhunc,sf_malloc_quick;
-extern ulonglong sf_malloc_mem_limit;
-
-#define CALLER_INFO_PROTO   , const char *sFile, uint uLine
-#define CALLER_INFO         , __FILE__, __LINE__
-#define ORIG_CALLER_INFO    , sFile, uLine
-#else
-#define my_checkmalloc()
-#undef TERMINATE
-#define TERMINATE(A) {}
-#define QUICK_SAFEMALLOC
-#define NORMAL_SAFEMALLOC
-extern gptr my_malloc(uint Size,myf MyFlags);
-#define my_malloc_ci(SZ,FLAG) my_malloc( SZ, FLAG )
-extern gptr my_realloc(gptr oldpoint,uint Size,myf MyFlags);
-extern void my_no_flags_free(gptr ptr);
-extern gptr my_memdup(const byte *from,uint length,myf MyFlags);
-extern char *my_strdup(const char *from,myf MyFlags);
-extern char *my_strdup_with_length(const byte *from, uint length,
-				   myf MyFlags);
-/* we do use FG (as a no-op) in below so that a typo on FG is caught */
-#define my_free(PTR,FG) ((void)FG,my_no_flags_free(PTR))
-#define CALLER_INFO_PROTO   /* nothing */
-#define CALLER_INFO         /* nothing */
-#define ORIG_CALLER_INFO    /* nothing */
-#define TRASH(A,B) /* nothing */
-#endif
-
-#ifdef HAVE_LARGE_PAGES
-extern uint my_get_large_page_size(void);
-extern gptr my_large_malloc(uint size, myf my_flags);
-extern void my_large_free(gptr ptr, myf my_flags);
-#else
-#define my_get_large_page_size() (0)
-#define my_large_malloc(A,B) my_malloc_lock((A),(B))
-#define my_large_free(A,B) my_free_lock((A),(B))
-#endif /* HAVE_LARGE_PAGES */
-
-#ifdef HAVE_ALLOCA
-#if defined(_AIX) && !defined(__GNUC__) && !defined(_AIX43)
-#pragma alloca
-#endif /* _AIX */
-#if defined(__MWERKS__)
-#undef alloca
-#define alloca _alloca
-#endif /* __MWERKS__ */
-#if defined(__GNUC__) && !defined(HAVE_ALLOCA_H) && ! defined(alloca)
-#define alloca __builtin_alloca
-#endif /* GNUC */
-#define my_alloca(SZ) alloca((size_t) (SZ))
-#define my_afree(PTR) {}
-#else
-#define my_alloca(SZ) my_malloc(SZ,MYF(0))
-#define my_afree(PTR) my_free(PTR,MYF(MY_WME))
-#endif /* HAVE_ALLOCA */
-
-#ifdef MSDOS
-#ifdef __ZTC__
-void * __CDECL halloc(long count,size_t length);
-void   __CDECL hfree(void *ptr);
-#endif
-#if defined(USE_HALLOC)
-#if defined(_VCM_) || defined(M_IC80386)
-#undef USE_HALLOC
-#endif
-#endif
-#ifdef USE_HALLOC
-#define malloc(a) halloc((long) (a),1)
-#define free(a) hfree(a)
-#endif
-#endif /* MSDOS */
-
-#ifndef errno				/* did we already get it? */
-#ifdef HAVE_ERRNO_AS_DEFINE
-#include <errno.h>			/* errno is a define */
-#else
-extern int errno;			/* declare errno */
-#endif
-#endif					/* #ifndef errno */
-extern char NEAR errbuff[NRERRBUFFS][ERRMSGSIZE];
-extern char *home_dir;			/* Home directory for user */
-extern const char *my_progname;		/* program-name (printed in errors) */
-extern char NEAR curr_dir[];		/* Current directory for user */
-extern int (*error_handler_hook)(uint my_err, const char *str,myf MyFlags);
-extern int (*fatal_error_handler_hook)(uint my_err, const char *str,
-				       myf MyFlags);
-extern uint my_file_limit;
-
-#ifdef HAVE_LARGE_PAGES
-extern my_bool my_use_large_pages;
-extern uint    my_large_page_size;
-#endif
-
-/* charsets */
-extern CHARSET_INFO *default_charset_info;
-extern CHARSET_INFO *all_charsets[256];
-extern CHARSET_INFO compiled_charsets[];
-
-/* statistics */
-extern ulong	my_file_opened,my_stream_opened, my_tmp_file_created;
-extern uint	mysys_usage_id;
-extern my_bool	my_init_done;
-
-					/* Point to current my_message() */
-extern void (*my_sigtstp_cleanup)(void),
-					/* Executed before jump to shell */
-	    (*my_sigtstp_restart)(void),
-	    (*my_abort_hook)(int);
-					/* Executed when comming from shell */
-extern int NEAR my_umask,		/* Default creation mask  */
-	   NEAR my_umask_dir,
-	   NEAR my_recived_signals,	/* Signals we have got */
-	   NEAR my_safe_to_handle_signal, /* Set when allowed to SIGTSTP */
-	   NEAR my_dont_interrupt;	/* call remember_intr when set */
-extern my_bool NEAR mysys_uses_curses, my_use_symdir;
-extern ulong sf_malloc_cur_memory, sf_malloc_max_memory;
-
-extern ulong	my_default_record_cache_size;
-extern my_bool NEAR my_disable_locking,NEAR my_disable_async_io,
-               NEAR my_disable_flush_key_blocks, NEAR my_disable_symlinks;
-extern char	wild_many,wild_one,wild_prefix;
-extern const char *charsets_dir;
-extern char *defaults_extra_file;
-extern const char *defaults_group_suffix;
-extern const char *defaults_file;
-
-extern my_bool timed_mutexes;
-
-typedef struct wild_file_pack	/* Struct to hold info when selecting files */
-{
-  uint		wilds;		/* How many wildcards */
-  uint		not_pos;	/* Start of not-theese-files */
-  my_string	*wild;		/* Pointer to wildcards */
-} WF_PACK;
-
-enum loglevel {
-   ERROR_LEVEL,
-   WARNING_LEVEL,
-   INFORMATION_LEVEL
-};
-
-enum cache_type
-{
-  TYPE_NOT_SET= 0, READ_CACHE, WRITE_CACHE,
-  SEQ_READ_APPEND		/* sequential read or append */,
-  READ_FIFO, READ_NET,WRITE_NET};
-
-enum flush_type
-{
-  FLUSH_KEEP, FLUSH_RELEASE, FLUSH_IGNORE_CHANGED, FLUSH_FORCE_WRITE
-};
-
-typedef struct st_record_cache	/* Used when cacheing records */
-{
-  File file;
-  int	rc_seek,error,inited;
-  uint	rc_length,read_length,reclength;
-  my_off_t rc_record_pos,end_of_file;
-  byte	*rc_buff,*rc_buff2,*rc_pos,*rc_end,*rc_request_pos;
-#ifdef HAVE_AIOWAIT
-  int	use_async_io;
-  my_aio_result aio_result;
-#endif
-  enum cache_type type;
-} RECORD_CACHE;
-
-enum file_type
-{
-  UNOPEN = 0, FILE_BY_OPEN, FILE_BY_CREATE, STREAM_BY_FOPEN, STREAM_BY_FDOPEN,
-  FILE_BY_MKSTEMP, FILE_BY_DUP
-};
-
-struct st_my_file_info
-{
-  my_string		name;
-  enum file_type	type;
-#if defined(THREAD) && !defined(HAVE_PREAD)
-  pthread_mutex_t	mutex;
-#endif
-};
-
-extern struct st_my_file_info *my_file_info;
-
-typedef struct st_my_tmpdir
-{
-  char **list;
-  uint cur, max;
-#ifdef THREAD
-  pthread_mutex_t mutex;
-#endif
-} MY_TMPDIR;
-
-typedef struct st_dynamic_array
-{
-  char *buffer;
-  uint elements,max_element;
-  uint alloc_increment;
-  uint size_of_element;
-} DYNAMIC_ARRAY;
-
-typedef struct st_dynamic_string
-{
-  char *str;
-  uint length,max_length,alloc_increment;
-} DYNAMIC_STRING;
-
-struct st_io_cache;
-typedef int (*IO_CACHE_CALLBACK)(struct st_io_cache*);
-
-#ifdef THREAD
-typedef struct st_io_cache_share
-{
-  /* to sync on reads into buffer */
-  pthread_mutex_t mutex;
-  pthread_cond_t  cond;
-  int             count, total;
-  /* actual IO_CACHE that filled the buffer */
-  struct st_io_cache *active;
-#ifdef NOT_YET_IMPLEMENTED
-  /* whether the structure should be free'd */
-  my_bool alloced;
-#endif
-} IO_CACHE_SHARE;
-#endif
-
-typedef struct st_io_cache		/* Used when cacheing files */
-{
-  /* Offset in file corresponding to the first byte of byte* buffer. */
-  my_off_t pos_in_file;
-  /*
-    The offset of end of file for READ_CACHE and WRITE_CACHE.
-    For SEQ_READ_APPEND it the maximum of the actual end of file and
-    the position represented by read_end.
-  */
-  my_off_t end_of_file;
-  /* Points to current read position in the buffer */
-  byte	*read_pos;
-  /* the non-inclusive boundary in the buffer for the currently valid read */
-  byte  *read_end;
-  byte  *buffer;				/* The read buffer */
-  /* Used in ASYNC_IO */
-  byte  *request_pos;
-
-  /* Only used in WRITE caches and in SEQ_READ_APPEND to buffer writes */
-  byte  *write_buffer;
-  /*
-    Only used in SEQ_READ_APPEND, and points to the current read position
-    in the write buffer. Note that reads in SEQ_READ_APPEND caches can
-    happen from both read buffer (byte* buffer) and write buffer
-    (byte* write_buffer).
-  */
-  byte *append_read_pos;
-  /* Points to current write position in the write buffer */
-  byte *write_pos;
-  /* The non-inclusive boundary of the valid write area */
-  byte *write_end;
-
-  /*
-    Current_pos and current_end are convenience variables used by
-    my_b_tell() and other routines that need to know the current offset
-    current_pos points to &write_pos, and current_end to &write_end in a
-    WRITE_CACHE, and &read_pos and &read_end respectively otherwise
-  */
-  byte  **current_pos, **current_end;
-#ifdef THREAD
-  /*
-    The lock is for append buffer used in SEQ_READ_APPEND cache
-    need mutex copying from append buffer to read buffer.
-  */
-  pthread_mutex_t append_buffer_lock;
-  /*
-    The following is used when several threads are reading the
-    same file in parallel. They are synchronized on disk
-    accesses reading the cached part of the file asynchronously.
-    It should be set to NULL to disable the feature.  Only
-    READ_CACHE mode is supported.
-  */
-  IO_CACHE_SHARE *share;
-#endif
-  /*
-    A caller will use my_b_read() macro to read from the cache
-    if the data is already in cache, it will be simply copied with
-    memcpy() and internal variables will be accordinging updated with
-    no functions invoked. However, if the data is not fully in the cache,
-    my_b_read() will call read_function to fetch the data. read_function
-    must never be invoked directly.
-  */
-  int (*read_function)(struct st_io_cache *,byte *,uint);
-  /*
-    Same idea as in the case of read_function, except my_b_write() needs to
-    be replaced with my_b_append() for a SEQ_READ_APPEND cache
-  */
-  int (*write_function)(struct st_io_cache *,const byte *,uint);
-  /*
-    Specifies the type of the cache. Depending on the type of the cache
-    certain operations might not be available and yield unpredicatable
-    results. Details to be documented later
-  */
-  enum cache_type type;
-  /*
-    Callbacks when the actual read I/O happens. These were added and
-    are currently used for binary logging of LOAD DATA INFILE - when a
-    block is read from the file, we create a block create/append event, and
-    when IO_CACHE is closed, we create an end event. These functions could,
-    of course be used for other things
-  */
-  IO_CACHE_CALLBACK pre_read;
-  IO_CACHE_CALLBACK post_read;
-  IO_CACHE_CALLBACK pre_close;
-  /*
-    Counts the number of times, when we were forced to use disk. We use it to
-    increase the binlog_cache_disk_use status variable.
-  */
-  ulong disk_writes;
-  void* arg;				/* for use by pre/post_read */
-  char *file_name;			/* if used with 'open_cached_file' */
-  char *dir,*prefix;
-  File file; /* file descriptor */
-  /*
-    seek_not_done is set by my_b_seek() to inform the upcoming read/write
-    operation that a seek needs to be preformed prior to the actual I/O
-    error is 0 if the cache operation was successful, -1 if there was a
-    "hard" error, and the actual number of I/O-ed bytes if the read/write was
-    partial.
-  */
-  int	seek_not_done,error;
-  /* buffer_length is memory size allocated for buffer or write_buffer */
-  uint	buffer_length;
-  /* read_length is the same as buffer_length except when we use async io */
-  uint  read_length;
-  myf	myflags;			/* Flags used to my_read/my_write */
-  /*
-    alloced_buffer is 1 if the buffer was allocated by init_io_cache() and
-    0 if it was supplied by the user.
-    Currently READ_NET is the only one that will use a buffer allocated
-    somewhere else
-  */
-  my_bool alloced_buffer;
-#ifdef HAVE_AIOWAIT
-  /*
-    As inidicated by ifdef, this is for async I/O, which is not currently
-    used (because it's not reliable on all systems)
-  */
-  uint inited;
-  my_off_t aio_read_pos;
-  my_aio_result aio_result;
-#endif
-} IO_CACHE;
-
-typedef int (*qsort2_cmp)(const void *, const void *, const void *);
-
-	/* defines for mf_iocache */
-
-	/* Test if buffer is inited */
-#define my_b_clear(info) (info)->buffer=0
-#define my_b_inited(info) (info)->buffer
-#define my_b_EOF INT_MIN
-
-#define my_b_read(info,Buffer,Count) \
-  ((info)->read_pos + (Count) <= (info)->read_end ?\
-   (memcpy(Buffer,(info)->read_pos,(size_t) (Count)), \
-    ((info)->read_pos+=(Count)),0) :\
-   (*(info)->read_function)((info),Buffer,Count))
-
-#define my_b_write(info,Buffer,Count) \
- ((info)->write_pos + (Count) <=(info)->write_end ?\
-  (memcpy((info)->write_pos, (Buffer), (size_t)(Count)),\
-   ((info)->write_pos+=(Count)),0) : \
-   (*(info)->write_function)((info),(Buffer),(Count)))
-
-#define my_b_get(info) \
-  ((info)->read_pos != (info)->read_end ?\
-   ((info)->read_pos++, (int) (uchar) (info)->read_pos[-1]) :\
-   _my_b_get(info))
-
-	/* my_b_write_byte dosn't have any err-check */
-#define my_b_write_byte(info,chr) \
-  (((info)->write_pos < (info)->write_end) ?\
-   ((*(info)->write_pos++)=(chr)) :\
-   (_my_b_write(info,0,0) , ((*(info)->write_pos++)=(chr))))
-
-#define my_b_fill_cache(info) \
-  (((info)->read_end=(info)->read_pos),(*(info)->read_function)(info,0,0))
-
-#define my_b_tell(info) ((info)->pos_in_file + \
-			 (uint) (*(info)->current_pos - (info)->request_pos))
-
-/* tell write offset in the SEQ_APPEND cache */
-my_off_t my_b_append_tell(IO_CACHE* info);
-my_off_t my_b_safe_tell(IO_CACHE* info); /* picks the correct tell() */
-
-#define my_b_bytes_in_cache(info) (uint) (*(info)->current_end - \
-					  *(info)->current_pos)
-
-typedef uint32 ha_checksum;
-
-/* Define the type of function to be passed to process_default_option_files */
-typedef int (*Process_option_func)(void *ctx, const char *group_name,
-                                   const char *option);
-
-#include <my_alloc.h>
-
-	/* Prototypes for mysys and my_func functions */
-
-extern int my_copy(const char *from,const char *to,myf MyFlags);
-extern int my_append(const char *from,const char *to,myf MyFlags);
-extern int my_delete(const char *name,myf MyFlags);
-extern int my_getwd(my_string buf,uint size,myf MyFlags);
-extern int my_setwd(const char *dir,myf MyFlags);
-extern int my_lock(File fd,int op,my_off_t start, my_off_t length,myf MyFlags);
-extern gptr my_once_alloc(uint Size,myf MyFlags);
-extern void my_once_free(void);
-extern char *my_once_strdup(const char *src,myf myflags);
-extern char *my_once_memdup(const char *src, uint len, myf myflags);
-extern File my_open(const char *FileName,int Flags,myf MyFlags);
-extern File my_register_filename(File fd, const char *FileName,
-				 enum file_type type_of_file,
-				 uint error_message_number, myf MyFlags);
-extern File my_create(const char *FileName,int CreateFlags,
-		      int AccsesFlags, myf MyFlags);
-extern int my_close(File Filedes,myf MyFlags);
-extern File my_dup(File file, myf MyFlags);
-extern int my_mkdir(const char *dir, int Flags, myf MyFlags);
-extern int my_readlink(char *to, const char *filename, myf MyFlags);
-extern int my_realpath(char *to, const char *filename, myf MyFlags);
-extern File my_create_with_symlink(const char *linkname, const char *filename,
-				   int createflags, int access_flags,
-				   myf MyFlags);
-extern int my_delete_with_symlink(const char *name, myf MyFlags);
-extern int my_rename_with_symlink(const char *from,const char *to,myf MyFlags);
-extern int my_symlink(const char *content, const char *linkname, myf MyFlags);
-extern uint my_read(File Filedes,byte *Buffer,uint Count,myf MyFlags);
-extern uint my_pread(File Filedes,byte *Buffer,uint Count,my_off_t offset,
-		     myf MyFlags);
-extern int my_rename(const char *from,const char *to,myf MyFlags);
-extern my_off_t my_seek(File fd,my_off_t pos,int whence,myf MyFlags);
-extern my_off_t my_tell(File fd,myf MyFlags);
-extern uint my_write(File Filedes,const byte *Buffer,uint Count,
-		     myf MyFlags);
-extern uint my_pwrite(File Filedes,const byte *Buffer,uint Count,
-		      my_off_t offset,myf MyFlags);
-extern uint my_fread(FILE *stream,byte *Buffer,uint Count,myf MyFlags);
-extern uint my_fwrite(FILE *stream,const byte *Buffer,uint Count,
-		      myf MyFlags);
-extern my_off_t my_fseek(FILE *stream,my_off_t pos,int whence,myf MyFlags);
-extern my_off_t my_ftell(FILE *stream,myf MyFlags);
-extern gptr _mymalloc(uint uSize,const char *sFile,
-		      uint uLine, myf MyFlag);
-extern gptr _myrealloc(gptr pPtr,uint uSize,const char *sFile,
-		       uint uLine, myf MyFlag);
-extern gptr my_multi_malloc _VARARGS((myf MyFlags, ...));
-extern void _myfree(gptr pPtr,const char *sFile,uint uLine, myf MyFlag);
-extern int _sanity(const char *sFile,unsigned int uLine);
-extern gptr _my_memdup(const byte *from,uint length,
-		       const char *sFile, uint uLine,myf MyFlag);
-extern my_string _my_strdup(const char *from, const char *sFile, uint uLine,
-			    myf MyFlag);
-extern char *_my_strdup_with_length(const byte *from, uint length,
-				    const char *sFile, uint uLine,
-				    myf MyFlag);
-
-#ifdef __WIN__
-extern int my_access(const char *path, int amode);
-extern File my_sopen(const char *path, int oflag, int shflag, int pmode);
-#else
-#define my_access access
-#endif
-extern int check_if_legal_filename(const char *path);
-
-#ifndef TERMINATE
-extern void TERMINATE(FILE *file);
-#endif
-extern void init_glob_errs(void);
-extern FILE *my_fopen(const char *FileName,int Flags,myf MyFlags);
-extern FILE *my_fdopen(File Filedes,const char *name, int Flags,myf MyFlags);
-extern int my_fclose(FILE *fd,myf MyFlags);
-extern int my_chsize(File fd,my_off_t newlength, int filler, myf MyFlags);
-extern int my_sync(File fd, myf my_flags);
-extern int my_error _VARARGS((int nr,myf MyFlags, ...));
-extern int my_printf_error _VARARGS((uint my_err, const char *format,
-				     myf MyFlags, ...)
-				    __attribute__ ((format (printf, 2, 4))));
-extern int my_error_register(const char **errmsgs, int first, int last);
-extern const char **my_error_unregister(int first, int last);
-extern int my_message(uint my_err, const char *str,myf MyFlags);
-extern int my_message_no_curses(uint my_err, const char *str,myf MyFlags);
-extern int my_message_curses(uint my_err, const char *str,myf MyFlags);
-extern my_bool my_init(void);
-extern void my_end(int infoflag);
-extern int my_redel(const char *from, const char *to, int MyFlags);
-extern int my_copystat(const char *from, const char *to, int MyFlags);
-extern my_string my_filename(File fd);
-
-#ifndef THREAD
-extern void dont_break(void);
-extern void allow_break(void);
-#else
-#define dont_break()
-#define allow_break()
-#endif
-
-extern my_bool init_tmpdir(MY_TMPDIR *tmpdir, const char *pathlist);
-extern char *my_tmpdir(MY_TMPDIR *tmpdir);
-extern void free_tmpdir(MY_TMPDIR *tmpdir);
-
-extern void my_remember_signal(int signal_number,sig_handler (*func)(int));
-extern uint dirname_part(my_string to,const char *name);
-extern uint dirname_length(const char *name);
-#define base_name(A) (A+dirname_length(A))
-extern int test_if_hard_path(const char *dir_name);
-extern my_bool has_path(const char *name);
-extern char *convert_dirname(char *to, const char *from, const char *from_end);
-extern void to_unix_path(my_string name);
-extern my_string fn_ext(const char *name);
-extern my_string fn_same(my_string toname,const char *name,int flag);
-extern my_string fn_format(my_string to,const char *name,const char *dir,
-			   const char *form, uint flag);
-extern size_s strlength(const char *str);
-extern void pack_dirname(my_string to,const char *from);
-extern uint unpack_dirname(my_string to,const char *from);
-extern uint cleanup_dirname(my_string to,const char *from);
-extern uint system_filename(my_string to,const char *from);
-extern uint unpack_filename(my_string to,const char *from);
-extern my_string intern_filename(my_string to,const char *from);
-extern my_string directory_file_name(my_string dst, const char *src);
-extern int pack_filename(my_string to, const char *name, size_s max_length);
-extern my_string my_path(my_string to,const char *progname,
-			 const char *own_pathname_part);
-extern my_string my_load_path(my_string to, const char *path,
-			      const char *own_path_prefix);
-extern int wild_compare(const char *str,const char *wildstr,pbool str_is_pattern);
-extern WF_PACK *wf_comp(my_string str);
-extern int wf_test(struct wild_file_pack *wf_pack,const char *name);
-extern void wf_end(struct wild_file_pack *buffer);
-extern size_s strip_sp(my_string str);
-extern void get_date(my_string to,int timeflag,time_t use_time);
-extern void soundex(CHARSET_INFO *, my_string out_pntr, my_string in_pntr,pbool remove_garbage);
-extern int init_record_cache(RECORD_CACHE *info,uint cachesize,File file,
-			     uint reclength,enum cache_type type,
-			     pbool use_async_io);
-extern int read_cache_record(RECORD_CACHE *info,byte *to);
-extern int end_record_cache(RECORD_CACHE *info);
-extern int write_cache_record(RECORD_CACHE *info,my_off_t filepos,
-			      const byte *record,uint length);
-extern int flush_write_cache(RECORD_CACHE *info);
-extern long my_clock(void);
-extern sig_handler sigtstp_handler(int signal_number);
-extern void handle_recived_signals(void);
-
-extern sig_handler my_set_alarm_variable(int signo);
-extern void my_string_ptr_sort(void *base,uint items,size_s size);
-extern void radixsort_for_str_ptr(uchar* base[], uint number_of_elements,
-				  size_s size_of_element,uchar *buffer[]);
-extern qsort_t qsort2(void *base_ptr, size_t total_elems, size_t size,
-		      qsort2_cmp cmp, void *cmp_argument);
-extern qsort2_cmp get_ptr_compare(uint);
-void my_store_ptr(byte *buff, uint pack_length, my_off_t pos);
-my_off_t my_get_ptr(byte *ptr, uint pack_length);
-extern int init_io_cache(IO_CACHE *info,File file,uint cachesize,
-			 enum cache_type type,my_off_t seek_offset,
-			 pbool use_async_io, myf cache_myflags);
-extern my_bool reinit_io_cache(IO_CACHE *info,enum cache_type type,
-			       my_off_t seek_offset,pbool use_async_io,
-			       pbool clear_cache);
-extern void setup_io_cache(IO_CACHE* info);
-extern int _my_b_read(IO_CACHE *info,byte *Buffer,uint Count);
-#ifdef THREAD
-extern int _my_b_read_r(IO_CACHE *info,byte *Buffer,uint Count);
-extern void init_io_cache_share(IO_CACHE *info,
-				IO_CACHE_SHARE *s, uint num_threads);
-extern void remove_io_thread(IO_CACHE *info);
-#endif
-extern int _my_b_seq_read(IO_CACHE *info,byte *Buffer,uint Count);
-extern int _my_b_net_read(IO_CACHE *info,byte *Buffer,uint Count);
-extern int _my_b_get(IO_CACHE *info);
-extern int _my_b_async_read(IO_CACHE *info,byte *Buffer,uint Count);
-extern int _my_b_write(IO_CACHE *info,const byte *Buffer,uint Count);
-extern int my_b_append(IO_CACHE *info,const byte *Buffer,uint Count);
-extern int my_b_safe_write(IO_CACHE *info,const byte *Buffer,uint Count);
-
-extern int my_block_write(IO_CACHE *info, const byte *Buffer,
-			  uint Count, my_off_t pos);
-extern int my_b_flush_io_cache(IO_CACHE *info, int need_append_buffer_lock);
-
-#define flush_io_cache(info) my_b_flush_io_cache((info),1)
-
-extern int end_io_cache(IO_CACHE *info);
-extern uint my_b_fill(IO_CACHE *info);
-extern void my_b_seek(IO_CACHE *info,my_off_t pos);
-extern uint my_b_gets(IO_CACHE *info, char *to, uint max_length);
-extern my_off_t my_b_filelength(IO_CACHE *info);
-extern uint my_b_printf(IO_CACHE *info, const char* fmt, ...);
-extern uint my_b_vprintf(IO_CACHE *info, const char* fmt, va_list ap);
-extern my_bool open_cached_file(IO_CACHE *cache,const char *dir,
-				 const char *prefix, uint cache_size,
-				 myf cache_myflags);
-extern my_bool real_open_cached_file(IO_CACHE *cache);
-extern void close_cached_file(IO_CACHE *cache);
-File create_temp_file(char *to, const char *dir, const char *pfx,
-		      int mode, myf MyFlags);
-#define my_init_dynamic_array(A,B,C,D) init_dynamic_array(A,B,C,D CALLER_INFO)
-#define my_init_dynamic_array_ci(A,B,C,D) init_dynamic_array(A,B,C,D ORIG_CALLER_INFO)
-extern my_bool init_dynamic_array(DYNAMIC_ARRAY *array,uint element_size,
-                                  uint init_alloc,uint alloc_increment
-                                  CALLER_INFO_PROTO);
-extern my_bool insert_dynamic(DYNAMIC_ARRAY *array,gptr element);
-extern byte *alloc_dynamic(DYNAMIC_ARRAY *array);
-extern byte *pop_dynamic(DYNAMIC_ARRAY*);
-extern my_bool set_dynamic(DYNAMIC_ARRAY *array,gptr element,uint array_index);
-extern void get_dynamic(DYNAMIC_ARRAY *array,gptr element,uint array_index);
-extern void delete_dynamic(DYNAMIC_ARRAY *array);
-extern void delete_dynamic_element(DYNAMIC_ARRAY *array, uint array_index);
-extern void freeze_size(DYNAMIC_ARRAY *array);
-#define dynamic_array_ptr(array,array_index) ((array)->buffer+(array_index)*(array)->size_of_element)
-#define dynamic_element(array,array_index,type) ((type)((array)->buffer) +(array_index))
-#define push_dynamic(A,B) insert_dynamic(A,B)
-#define reset_dynamic(array) ((array)->elements= 0)
-
-extern my_bool init_dynamic_string(DYNAMIC_STRING *str, const char *init_str,
-				   uint init_alloc,uint alloc_increment);
-extern my_bool dynstr_append(DYNAMIC_STRING *str, const char *append);
-my_bool dynstr_append_mem(DYNAMIC_STRING *str, const char *append,
-			  uint length);
-extern my_bool dynstr_set(DYNAMIC_STRING *str, const char *init_str);
-extern my_bool dynstr_realloc(DYNAMIC_STRING *str, ulong additional_size);
-extern void dynstr_free(DYNAMIC_STRING *str);
-#ifdef HAVE_MLOCK
-extern byte *my_malloc_lock(uint length,myf flags);
-extern void my_free_lock(byte *ptr,myf flags);
-#else
-#define my_malloc_lock(A,B) my_malloc((A),(B))
-#define my_free_lock(A,B) my_free((A),(B))
-#endif
-#define alloc_root_inited(A) ((A)->min_malloc != 0)
-#define ALLOC_ROOT_MIN_BLOCK_SIZE (MALLOC_OVERHEAD + sizeof(USED_MEM) + 8)
-#define clear_alloc_root(A) do { (A)->free= (A)->used= (A)->pre_alloc= 0; (A)->min_malloc=0;} while(0)
-extern void init_alloc_root(MEM_ROOT *mem_root, uint block_size,
-			    uint pre_alloc_size);
-extern gptr alloc_root(MEM_ROOT *mem_root,unsigned int Size);
-extern gptr multi_alloc_root(MEM_ROOT *mem_root, ...);
-extern void free_root(MEM_ROOT *root, myf MyFLAGS);
-extern void set_prealloc_root(MEM_ROOT *root, char *ptr);
-extern void reset_root_defaults(MEM_ROOT *mem_root, uint block_size,
-                                uint prealloc_size);
-extern char *strdup_root(MEM_ROOT *root,const char *str);
-extern char *strmake_root(MEM_ROOT *root,const char *str,uint len);
-extern char *memdup_root(MEM_ROOT *root,const char *str,uint len);
-extern int get_defaults_options(int argc, char **argv,
-                                char **defaults, char **extra_defaults,
-                                char **group_suffix);
-extern int load_defaults(const char *conf_file, const char **groups,
-			 int *argc, char ***argv);
-extern int modify_defaults_file(const char *file_location, const char *option,
-                                const char *option_value,
-                                const char *section_name, int remove_option);
-extern int my_search_option_files(const char *conf_file, int *argc,
-                                  char ***argv, uint *args_used,
-                                  Process_option_func func, void *func_ctx);
-extern void free_defaults(char **argv);
-extern void my_print_default_files(const char *conf_file);
-extern void print_defaults(const char *conf_file, const char **groups);
-extern my_bool my_compress(byte *, ulong *, ulong *);
-extern my_bool my_uncompress(byte *, ulong *, ulong *);
-extern byte *my_compress_alloc(const byte *packet, ulong *len, ulong *complen);
-extern ha_checksum my_checksum(ha_checksum crc, const byte *mem, uint count);
-extern uint my_bit_log2(ulong value);
-extern uint my_count_bits(ulonglong v);
-extern uint my_count_bits_ushort(ushort v);
-extern void my_sleep(ulong m_seconds);
-extern ulong crc32(ulong crc, const uchar *buf, uint len);
-extern uint my_set_max_open_files(uint files);
-void my_free_open_file_info(void);
-
-ulonglong my_getsystime(void);
-my_bool my_gethwaddr(uchar *to);
-
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-
-#ifndef MAP_NOSYNC
-#define MAP_NOSYNC      0
-#endif
-
-#define my_mmap(a,b,c,d,e,f)    mmap(a,b,c,d,e,f)
-#ifdef HAVE_GETPAGESIZE
-#define my_getpagesize()        getpagesize()
-#else
-/* qnx ? */
-#define my_getpagesize()        8192
-#endif
-#define my_munmap(a,b)          munmap((a),(b))
-
-#else
-/* not a complete set of mmap() flags, but only those that nesessary */
-#define PROT_READ        1
-#define PROT_WRITE       2
-#define MAP_SHARED       0x0001
-#define MAP_NOSYNC       0x0800
-#define MAP_FAILED       ((void *)-1)
-#define MS_SYNC          0x0000
-
-#ifndef __NETWARE__
-#define HAVE_MMAP
-#endif
-
-int my_getpagesize(void);
-void *my_mmap(void *, size_t, int, int, int, my_off_t);
-int my_munmap(void *, size_t);
-#endif
-
-int my_msync(int, void *, size_t, int);
-
-/* character sets */
-extern uint get_charset_number(const char *cs_name, uint cs_flags);
-extern uint get_collation_number(const char *name);
-extern const char *get_charset_name(uint cs_number);
-
-extern CHARSET_INFO *get_charset(uint cs_number, myf flags);
-extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags);
-extern CHARSET_INFO *get_charset_by_csname(const char *cs_name,
-					   uint cs_flags, myf my_flags);
-extern void free_charsets(void);
-extern char *get_charsets_dir(char *buf);
-extern my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2);
-extern my_bool init_compiled_charsets(myf flags);
-extern void add_compiled_collation(CHARSET_INFO *cs);
-extern ulong escape_string_for_mysql(CHARSET_INFO *charset_info,
-                                     char *to, ulong to_length,
-                                     const char *from, ulong length);
-#ifdef __WIN__
-#define BACKSLASH_MBTAIL
-/* File system character set */
-extern CHARSET_INFO *fs_character_set(void);
-#endif
-extern ulong escape_quotes_for_mysql(CHARSET_INFO *charset_info,
-                                     char *to, ulong to_length,
-                                     const char *from, ulong length);
-
-extern void thd_increment_bytes_sent(ulong length);
-extern void thd_increment_bytes_received(ulong length);
-extern void thd_increment_net_big_packet_count(ulong length);
-
-#ifdef __WIN__
-extern my_bool have_tcpip;		/* Is set if tcpip is used */
-
-/* implemented in my_windac.c */
-
-int my_security_attr_create(SECURITY_ATTRIBUTES **psa, const char **perror,
-                            DWORD owner_rights, DWORD everybody_rights);
-
-void my_security_attr_free(SECURITY_ATTRIBUTES *sa);
-
-/* implemented in my_conio.c */
-char* my_cgets(char *string, unsigned long clen, unsigned long* plen);
-
-#endif
-#ifdef __NETWARE__
-void netware_reg_user(const char *ip, const char *user,
-		      const char *application);
-#endif
-
-C_MODE_END
-#include "raid.h"
-#endif /* _my_sys_h */
diff --git a/src/mysql/mysql-5.0.20 b/src/mysql/mysql-5.0.20
deleted file mode 100644
index e69de29bb..000000000
--- a/src/mysql/mysql-5.0.20
+++ /dev/null
diff --git a/src/mysql/mysql.h b/src/mysql/mysql.h
deleted file mode 100644
index 925a45253..000000000
--- a/src/mysql/mysql.h
+++ /dev/null
@@ -1,847 +0,0 @@
-/* Copyright (C) 2000-2003 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifndef _mysql_h
-#define _mysql_h
-
-#ifdef __CYGWIN__     /* CYGWIN implements a UNIX API */
-#undef WIN
-#undef _WIN
-#undef _WIN32
-#undef _WIN64
-#undef __WIN__
-#endif
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-#ifndef _global_h				/* If not standard header */
-#include <sys/types.h>
-#ifdef __LCC__
-#include <winsock.h>				/* For windows */
-#endif
-typedef char my_bool;
-#if (defined(_WIN32) || defined(_WIN64)) && !defined(__WIN__)
-#define __WIN__
-#endif
-#if !defined(__WIN__)
-#define STDCALL
-#else
-#define STDCALL __stdcall
-#endif
-typedef char * gptr;
-
-#ifndef my_socket_defined
-#ifdef __WIN__
-#define my_socket SOCKET
-#else
-typedef int my_socket;
-#endif /* __WIN__ */
-#endif /* my_socket_defined */
-#endif /* _global_h */
-
-#include "mysql_com.h"
-#include "mysql_time.h"
-#include "mysql_version.h"
-#include "typelib.h"
-
-#include "my_list.h" /* for LISTs used in 'MYSQL' and 'MYSQL_STMT' */
-
-extern unsigned int mysql_port;
-extern char *mysql_unix_port;
-
-#define CLIENT_NET_READ_TIMEOUT		365*24*3600	/* Timeout on read */
-#define CLIENT_NET_WRITE_TIMEOUT	365*24*3600	/* Timeout on write */
-
-#ifdef __NETWARE__
-#pragma pack(push, 8)		/* 8 byte alignment */
-#endif
-
-#define IS_PRI_KEY(n)	((n) & PRI_KEY_FLAG)
-#define IS_NOT_NULL(n)	((n) & NOT_NULL_FLAG)
-#define IS_BLOB(n)	((n) & BLOB_FLAG)
-#define IS_NUM(t)	((t) <= FIELD_TYPE_INT24 || (t) == FIELD_TYPE_YEAR || (t) == FIELD_TYPE_NEWDECIMAL)
-#define IS_NUM_FIELD(f)	 ((f)->flags & NUM_FLAG)
-#define INTERNAL_NUM_FIELD(f) (((f)->type <= FIELD_TYPE_INT24 && ((f)->type != FIELD_TYPE_TIMESTAMP || (f)->length == 14 || (f)->length == 8)) || (f)->type == FIELD_TYPE_YEAR)
-
-
-typedef struct st_mysql_field {
-  char *name;                 /* Name of column */
-  char *org_name;             /* Original column name, if an alias */
-  char *table;                /* Table of column if column was a field */
-  char *org_table;            /* Org table name, if table was an alias */
-  char *db;                   /* Database for table */
-  char *catalog;	      /* Catalog for table */
-  char *def;                  /* Default value (set by mysql_list_fields) */
-  unsigned long length;       /* Width of column (create length) */
-  unsigned long max_length;   /* Max width for selected set */
-  unsigned int name_length;
-  unsigned int org_name_length;
-  unsigned int table_length;
-  unsigned int org_table_length;
-  unsigned int db_length;
-  unsigned int catalog_length;
-  unsigned int def_length;
-  unsigned int flags;         /* Div flags */
-  unsigned int decimals;      /* Number of decimals in field */
-  unsigned int charsetnr;     /* Character set */
-  enum enum_field_types type; /* Type of field. See mysql_com.h for types */
-} MYSQL_FIELD;
-
-typedef char **MYSQL_ROW;		/* return data as array of strings */
-typedef unsigned int MYSQL_FIELD_OFFSET; /* offset to current field */
-
-#ifndef _global_h
-#if defined(NO_CLIENT_LONG_LONG)
-typedef unsigned long my_ulonglong;
-#elif defined (__WIN__)
-typedef unsigned __int64 my_ulonglong;
-#else
-typedef unsigned long long my_ulonglong;
-#endif
-#endif
-
-#define MYSQL_COUNT_ERROR (~(my_ulonglong) 0)
-
-/* backward compatibility define - to be removed eventually */
-#define ER_WARN_DATA_TRUNCATED WARN_DATA_TRUNCATED
-
-typedef struct st_mysql_rows {
-  struct st_mysql_rows *next;		/* list of rows */
-  MYSQL_ROW data;
-  unsigned long length;
-} MYSQL_ROWS;
-
-typedef MYSQL_ROWS *MYSQL_ROW_OFFSET;	/* offset to current row */
-
-#include "my_alloc.h"
-
-typedef struct embedded_query_result EMBEDDED_QUERY_RESULT;
-typedef struct st_mysql_data {
-  my_ulonglong rows;
-  unsigned int fields;
-  MYSQL_ROWS *data;
-  MEM_ROOT alloc;
-  /* extra info for embedded library */
-  struct embedded_query_result *embedded_info;
-} MYSQL_DATA;
-
-enum mysql_option 
-{
-  MYSQL_OPT_CONNECT_TIMEOUT, MYSQL_OPT_COMPRESS, MYSQL_OPT_NAMED_PIPE,
-  MYSQL_INIT_COMMAND, MYSQL_READ_DEFAULT_FILE, MYSQL_READ_DEFAULT_GROUP,
-  MYSQL_SET_CHARSET_DIR, MYSQL_SET_CHARSET_NAME, MYSQL_OPT_LOCAL_INFILE,
-  MYSQL_OPT_PROTOCOL, MYSQL_SHARED_MEMORY_BASE_NAME, MYSQL_OPT_READ_TIMEOUT,
-  MYSQL_OPT_WRITE_TIMEOUT, MYSQL_OPT_USE_RESULT,
-  MYSQL_OPT_USE_REMOTE_CONNECTION, MYSQL_OPT_USE_EMBEDDED_CONNECTION,
-  MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP, MYSQL_SECURE_AUTH,
-  MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT
-};
-
-struct st_mysql_options {
-  unsigned int connect_timeout, read_timeout, write_timeout;
-  unsigned int port, protocol;
-  unsigned long client_flag;
-  char *host,*user,*password,*unix_socket,*db;
-  struct st_dynamic_array *init_commands;
-  char *my_cnf_file,*my_cnf_group, *charset_dir, *charset_name;
-  char *ssl_key;				/* PEM key file */
-  char *ssl_cert;				/* PEM cert file */
-  char *ssl_ca;					/* PEM CA file */
-  char *ssl_capath;				/* PEM directory of CA-s? */
-  char *ssl_cipher;				/* cipher to use */
-  char *shared_memory_base_name;
-  unsigned long max_allowed_packet;
-  my_bool use_ssl;				/* if to use SSL or not */
-  my_bool compress,named_pipe;
- /*
-   On connect, find out the replication role of the server, and
-   establish connections to all the peers
- */
-  my_bool rpl_probe;
- /*
-   Each call to mysql_real_query() will parse it to tell if it is a read
-   or a write, and direct it to the slave or the master
- */
-  my_bool rpl_parse;
- /*
-   If set, never read from a master, only from slave, when doing
-   a read that is replication-aware
- */
-  my_bool no_master_reads;
-#if !defined(CHECK_EMBEDDED_DIFFERENCES) || defined(EMBEDDED_LIBRARY)
-  my_bool separate_thread;
-#endif
-  enum mysql_option methods_to_use;
-  char *client_ip;
-  /* Refuse client connecting to server if it uses old (pre-4.1.1) protocol */
-  my_bool secure_auth;
-  /* 0 - never report, 1 - always report (default) */
-  my_bool report_data_truncation;
-
-  /* function pointers for local infile support */
-  int (*local_infile_init)(void **, const char *, void *);
-  int (*local_infile_read)(void *, char *, unsigned int);
-  void (*local_infile_end)(void *);
-  int (*local_infile_error)(void *, char *, unsigned int);
-  void *local_infile_userdata;
-};
-
-enum mysql_status 
-{
-  MYSQL_STATUS_READY,MYSQL_STATUS_GET_RESULT,MYSQL_STATUS_USE_RESULT
-};
-
-enum mysql_protocol_type 
-{
-  MYSQL_PROTOCOL_DEFAULT, MYSQL_PROTOCOL_TCP, MYSQL_PROTOCOL_SOCKET,
-  MYSQL_PROTOCOL_PIPE, MYSQL_PROTOCOL_MEMORY
-};
-/*
-  There are three types of queries - the ones that have to go to
-  the master, the ones that go to a slave, and the adminstrative
-  type which must happen on the pivot connectioin
-*/
-enum mysql_rpl_type 
-{
-  MYSQL_RPL_MASTER, MYSQL_RPL_SLAVE, MYSQL_RPL_ADMIN
-};
-
-typedef struct character_set
-{
-  unsigned int      number;     /* character set number              */
-  unsigned int      state;      /* character set state               */
-  const char        *csname;    /* collation name                    */
-  const char        *name;      /* character set name                */
-  const char        *comment;   /* comment                           */
-  const char        *dir;       /* character set directory           */
-  unsigned int      mbminlen;   /* min. length for multibyte strings */
-  unsigned int      mbmaxlen;   /* max. length for multibyte strings */
-} MY_CHARSET_INFO;
-
-struct st_mysql_methods;
-
-typedef struct st_mysql
-{
-  NET		net;			/* Communication parameters */
-  gptr		connector_fd;		/* ConnectorFd for SSL */
-  char		*host,*user,*passwd,*unix_socket,*server_version,*host_info,*info;
-  char          *db;
-  struct charset_info_st *charset;
-  MYSQL_FIELD	*fields;
-  MEM_ROOT	field_alloc;
-  my_ulonglong affected_rows;
-  my_ulonglong insert_id;		/* id if insert on table with NEXTNR */
-  my_ulonglong extra_info;		/* Not used */
-  unsigned long thread_id;		/* Id for connection in server */
-  unsigned long packet_length;
-  unsigned int	port;
-  unsigned long client_flag,server_capabilities;
-  unsigned int	protocol_version;
-  unsigned int	field_count;
-  unsigned int 	server_status;
-  unsigned int  server_language;
-  unsigned int	warning_count;
-  struct st_mysql_options options;
-  enum mysql_status status;
-  my_bool	free_me;		/* If free in mysql_close */
-  my_bool	reconnect;		/* set to 1 if automatic reconnect */
-
-  /* session-wide random string */
-  char	        scramble[SCRAMBLE_LENGTH+1];
-
- /*
-   Set if this is the original connection, not a master or a slave we have
-   added though mysql_rpl_probe() or mysql_set_master()/ mysql_add_slave()
- */
-  my_bool rpl_pivot;
-  /*
-    Pointers to the master, and the next slave connections, points to
-    itself if lone connection.
-  */
-  struct st_mysql* master, *next_slave;
-
-  struct st_mysql* last_used_slave; /* needed for round-robin slave pick */
- /* needed for send/read/store/use result to work correctly with replication */
-  struct st_mysql* last_used_con;
-
-  LIST  *stmts;                     /* list of all statements */
-  const struct st_mysql_methods *methods;
-  void *thd;
-  /*
-    Points to boolean flag in MYSQL_RES  or MYSQL_STMT. We set this flag 
-    from mysql_stmt_close if close had to cancel result set of this object.
-  */
-  my_bool *unbuffered_fetch_owner;
-#if defined(EMBEDDED_LIBRARY) || defined(EMBEDDED_LIBRARY_COMPATIBLE) || MYSQL_VERSION_ID >= 50100
-  /* needed for embedded server - no net buffer to store the 'info' */
-  char *info_buffer;
-#endif
-} MYSQL;
-
-typedef struct st_mysql_res {
-  my_ulonglong row_count;
-  MYSQL_FIELD	*fields;
-  MYSQL_DATA	*data;
-  MYSQL_ROWS	*data_cursor;
-  unsigned long *lengths;		/* column lengths of current row */
-  MYSQL		*handle;		/* for unbuffered reads */
-  MEM_ROOT	field_alloc;
-  unsigned int	field_count, current_field;
-  MYSQL_ROW	row;			/* If unbuffered read */
-  MYSQL_ROW	current_row;		/* buffer to current row */
-  my_bool	eof;			/* Used by mysql_fetch_row */
-  /* mysql_stmt_close() had to cancel this result */
-  my_bool       unbuffered_fetch_cancelled;  
-  const struct st_mysql_methods *methods;
-} MYSQL_RES;
-
-#define MAX_MYSQL_MANAGER_ERR 256  
-#define MAX_MYSQL_MANAGER_MSG 256
-
-#define MANAGER_OK           200
-#define MANAGER_INFO         250
-#define MANAGER_ACCESS       401
-#define MANAGER_CLIENT_ERR   450
-#define MANAGER_INTERNAL_ERR 500
-
-#if !defined(MYSQL_SERVER) && !defined(MYSQL_CLIENT)
-#define MYSQL_CLIENT
-#endif
-
-
-typedef struct st_mysql_manager
-{
-  NET net;
-  char *host,*user,*passwd;
-  unsigned int port;
-  my_bool free_me;
-  my_bool eof;
-  int cmd_status;
-  int last_errno;
-  char* net_buf,*net_buf_pos,*net_data_end;
-  int net_buf_size;
-  char last_error[MAX_MYSQL_MANAGER_ERR];
-} MYSQL_MANAGER;
-
-typedef struct st_mysql_parameters
-{
-  unsigned long *p_max_allowed_packet;
-  unsigned long *p_net_buffer_length;
-} MYSQL_PARAMETERS;
-
-#if !defined(MYSQL_SERVER) && !defined(EMBEDDED_LIBRARY)
-#define max_allowed_packet (*mysql_get_parameters()->p_max_allowed_packet)
-#define net_buffer_length (*mysql_get_parameters()->p_net_buffer_length)
-#endif
-
-/*
-  Set up and bring down the server; to ensure that applications will
-  work when linked against either the standard client library or the
-  embedded server library, these functions should be called.
-*/
-int STDCALL mysql_server_init(int argc, char **argv, char **groups);
-void STDCALL mysql_server_end(void);
-/*
-  mysql_server_init/end need to be called when using libmysqld or
-  libmysqlclient (exactly, mysql_server_init() is called by mysql_init() so
-  you don't need to call it explicitely; but you need to call
-  mysql_server_end() to free memory). The names are a bit misleading
-  (mysql_SERVER* to be used when using libmysqlCLIENT). So we add more general
-  names which suit well whether you're using libmysqld or libmysqlclient. We
-  intend to promote these aliases over the mysql_server* ones.
-*/
-#define mysql_library_init mysql_server_init
-#define mysql_library_end mysql_server_end
-
-MYSQL_PARAMETERS *STDCALL mysql_get_parameters(void);
-
-/*
-  Set up and bring down a thread; these function should be called
-  for each thread in an application which opens at least one MySQL
-  connection.  All uses of the connection(s) should be between these
-  function calls.
-*/
-my_bool STDCALL mysql_thread_init(void);
-void STDCALL mysql_thread_end(void);
-
-/*
-  Functions to get information from the MYSQL and MYSQL_RES structures
-  Should definitely be used if one uses shared libraries.
-*/
-
-my_ulonglong STDCALL mysql_num_rows(MYSQL_RES *res);
-unsigned int STDCALL mysql_num_fields(MYSQL_RES *res);
-my_bool STDCALL mysql_eof(MYSQL_RES *res);
-MYSQL_FIELD *STDCALL mysql_fetch_field_direct(MYSQL_RES *res,
-					      unsigned int fieldnr);
-MYSQL_FIELD * STDCALL mysql_fetch_fields(MYSQL_RES *res);
-MYSQL_ROW_OFFSET STDCALL mysql_row_tell(MYSQL_RES *res);
-MYSQL_FIELD_OFFSET STDCALL mysql_field_tell(MYSQL_RES *res);
-
-unsigned int STDCALL mysql_field_count(MYSQL *mysql);
-my_ulonglong STDCALL mysql_affected_rows(MYSQL *mysql);
-my_ulonglong STDCALL mysql_insert_id(MYSQL *mysql);
-unsigned int STDCALL mysql_errno(MYSQL *mysql);
-const char * STDCALL mysql_error(MYSQL *mysql);
-const char *STDCALL mysql_sqlstate(MYSQL *mysql);
-unsigned int STDCALL mysql_warning_count(MYSQL *mysql);
-const char * STDCALL mysql_info(MYSQL *mysql);
-unsigned long STDCALL mysql_thread_id(MYSQL *mysql);
-const char * STDCALL mysql_character_set_name(MYSQL *mysql);
-int          STDCALL mysql_set_character_set(MYSQL *mysql, const char *csname);
-
-MYSQL *		STDCALL mysql_init(MYSQL *mysql);
-my_bool		STDCALL mysql_ssl_set(MYSQL *mysql, const char *key,
-				      const char *cert, const char *ca,
-				      const char *capath, const char *cipher);
-my_bool		STDCALL mysql_change_user(MYSQL *mysql, const char *user, 
-					  const char *passwd, const char *db);
-MYSQL *		STDCALL mysql_real_connect(MYSQL *mysql, const char *host,
-					   const char *user,
-					   const char *passwd,
-					   const char *db,
-					   unsigned int port,
-					   const char *unix_socket,
-					   unsigned long clientflag);
-int		STDCALL mysql_select_db(MYSQL *mysql, const char *db);
-int		STDCALL mysql_query(MYSQL *mysql, const char *q);
-int		STDCALL mysql_send_query(MYSQL *mysql, const char *q,
-					 unsigned long length);
-int		STDCALL mysql_real_query(MYSQL *mysql, const char *q,
-					unsigned long length);
-MYSQL_RES *     STDCALL mysql_store_result(MYSQL *mysql);
-MYSQL_RES *     STDCALL mysql_use_result(MYSQL *mysql);
-
-/* perform query on master */
-my_bool		STDCALL mysql_master_query(MYSQL *mysql, const char *q,
-					   unsigned long length);
-my_bool		STDCALL mysql_master_send_query(MYSQL *mysql, const char *q,
-						unsigned long length);
-/* perform query on slave */  
-my_bool		STDCALL mysql_slave_query(MYSQL *mysql, const char *q,
-					  unsigned long length);
-my_bool		STDCALL mysql_slave_send_query(MYSQL *mysql, const char *q,
-					       unsigned long length);
-void        STDCALL mysql_get_character_set_info(MYSQL *mysql,
-                           MY_CHARSET_INFO *charset);
-
-/* local infile support */
-
-#define LOCAL_INFILE_ERROR_LEN 512
-
-void
-mysql_set_local_infile_handler(MYSQL *mysql,
-                               int (*local_infile_init)(void **, const char *,
-                            void *),
-                               int (*local_infile_read)(void *, char *,
-							unsigned int),
-                               void (*local_infile_end)(void *),
-                               int (*local_infile_error)(void *, char*,
-							 unsigned int),
-                               void *);
-
-void
-mysql_set_local_infile_default(MYSQL *mysql);
-
-
-/*
-  enable/disable parsing of all queries to decide if they go on master or
-  slave
-*/
-void            STDCALL mysql_enable_rpl_parse(MYSQL* mysql);
-void            STDCALL mysql_disable_rpl_parse(MYSQL* mysql);
-/* get the value of the parse flag */  
-int             STDCALL mysql_rpl_parse_enabled(MYSQL* mysql);
-
-/*  enable/disable reads from master */
-void            STDCALL mysql_enable_reads_from_master(MYSQL* mysql);
-void            STDCALL mysql_disable_reads_from_master(MYSQL* mysql);
-/* get the value of the master read flag */  
-my_bool		STDCALL mysql_reads_from_master_enabled(MYSQL* mysql);
-
-enum mysql_rpl_type     STDCALL mysql_rpl_query_type(const char* q, int len);  
-
-/* discover the master and its slaves */  
-my_bool		STDCALL mysql_rpl_probe(MYSQL* mysql);
-
-/* set the master, close/free the old one, if it is not a pivot */
-int             STDCALL mysql_set_master(MYSQL* mysql, const char* host,
-					 unsigned int port,
-					 const char* user,
-					 const char* passwd);
-int             STDCALL mysql_add_slave(MYSQL* mysql, const char* host,
-					unsigned int port,
-					const char* user,
-					const char* passwd);
-
-int		STDCALL mysql_shutdown(MYSQL *mysql,
-                                       enum mysql_enum_shutdown_level
-                                       shutdown_level);
-int		STDCALL mysql_dump_debug_info(MYSQL *mysql);
-int		STDCALL mysql_refresh(MYSQL *mysql,
-				     unsigned int refresh_options);
-int		STDCALL mysql_kill(MYSQL *mysql,unsigned long pid);
-int		STDCALL mysql_set_server_option(MYSQL *mysql,
-						enum enum_mysql_set_option
-						option);
-int		STDCALL mysql_ping(MYSQL *mysql);
-const char *	STDCALL mysql_stat(MYSQL *mysql);
-const char *	STDCALL mysql_get_server_info(MYSQL *mysql);
-const char *	STDCALL mysql_get_client_info(void);
-unsigned long	STDCALL mysql_get_client_version(void);
-const char *	STDCALL mysql_get_host_info(MYSQL *mysql);
-unsigned long	STDCALL mysql_get_server_version(MYSQL *mysql);
-unsigned int	STDCALL mysql_get_proto_info(MYSQL *mysql);
-MYSQL_RES *	STDCALL mysql_list_dbs(MYSQL *mysql,const char *wild);
-MYSQL_RES *	STDCALL mysql_list_tables(MYSQL *mysql,const char *wild);
-MYSQL_RES *	STDCALL mysql_list_processes(MYSQL *mysql);
-int		STDCALL mysql_options(MYSQL *mysql,enum mysql_option option,
-				      const char *arg);
-void		STDCALL mysql_free_result(MYSQL_RES *result);
-void		STDCALL mysql_data_seek(MYSQL_RES *result,
-					my_ulonglong offset);
-MYSQL_ROW_OFFSET STDCALL mysql_row_seek(MYSQL_RES *result,
-						MYSQL_ROW_OFFSET offset);
-MYSQL_FIELD_OFFSET STDCALL mysql_field_seek(MYSQL_RES *result,
-					   MYSQL_FIELD_OFFSET offset);
-MYSQL_ROW	STDCALL mysql_fetch_row(MYSQL_RES *result);
-unsigned long * STDCALL mysql_fetch_lengths(MYSQL_RES *result);
-MYSQL_FIELD *	STDCALL mysql_fetch_field(MYSQL_RES *result);
-MYSQL_RES *     STDCALL mysql_list_fields(MYSQL *mysql, const char *table,
-					  const char *wild);
-unsigned long	STDCALL mysql_escape_string(char *to,const char *from,
-					    unsigned long from_length);
-unsigned long	STDCALL mysql_hex_string(char *to,const char *from,
-                                         unsigned long from_length);
-unsigned long STDCALL mysql_real_escape_string(MYSQL *mysql,
-					       char *to,const char *from,
-					       unsigned long length);
-void		STDCALL mysql_debug(const char *debug);
-char *		STDCALL mysql_odbc_escape_string(MYSQL *mysql,
-						 char *to,
-						 unsigned long to_length,
-						 const char *from,
-						 unsigned long from_length,
-						 void *param,
-						 char *
-						 (*extend_buffer)
-						 (void *, char *to,
-						  unsigned long *length));
-void 		STDCALL myodbc_remove_escape(MYSQL *mysql,char *name);
-unsigned int	STDCALL mysql_thread_safe(void);
-my_bool		STDCALL mysql_embedded(void);
-MYSQL_MANAGER*  STDCALL mysql_manager_init(MYSQL_MANAGER* con);  
-MYSQL_MANAGER*  STDCALL mysql_manager_connect(MYSQL_MANAGER* con,
-					      const char* host,
-					      const char* user,
-					      const char* passwd,
-					      unsigned int port);
-void            STDCALL mysql_manager_close(MYSQL_MANAGER* con);
-int             STDCALL mysql_manager_command(MYSQL_MANAGER* con,
-						const char* cmd, int cmd_len);
-int             STDCALL mysql_manager_fetch_line(MYSQL_MANAGER* con,
-						  char* res_buf,
-						 int res_buf_size);
-my_bool         STDCALL mysql_read_query_result(MYSQL *mysql);
-
-
-/*
-  The following definitions are added for the enhanced 
-  client-server protocol
-*/
-
-/* statement state */
-enum enum_mysql_stmt_state
-{
-  MYSQL_STMT_INIT_DONE= 1, MYSQL_STMT_PREPARE_DONE, MYSQL_STMT_EXECUTE_DONE,
-  MYSQL_STMT_FETCH_DONE
-};
-
-
-/*
-  This structure is used to define bind information, and
-  internally by the client library.
-  Public members with their descriptions are listed below
-  (conventionally `On input' refers to the binds given to
-  mysql_stmt_bind_param, `On output' refers to the binds given
-  to mysql_stmt_bind_result):
-
-  buffer_type    - One of the MYSQL_* types, used to describe
-                   the host language type of buffer.
-                   On output: if column type is different from
-                   buffer_type, column value is automatically converted
-                   to buffer_type before it is stored in the buffer.
-  buffer         - On input: points to the buffer with input data.
-                   On output: points to the buffer capable to store
-                   output data.
-                   The type of memory pointed by buffer must correspond
-                   to buffer_type. See the correspondence table in
-                   the comment to mysql_stmt_bind_param.
-
-  The two above members are mandatory for any kind of bind.
-
-  buffer_length  - the length of the buffer. You don't have to set
-                   it for any fixed length buffer: float, double,
-                   int, etc. It must be set however for variable-length
-                   types, such as BLOBs or STRINGs.
-
-  length         - On input: in case when lengths of input values
-                   are different for each execute, you can set this to
-                   point at a variable containining value length. This
-                   way the value length can be different in each execute.
-                   If length is not NULL, buffer_length is not used.
-                   Note, length can even point at buffer_length if
-                   you keep bind structures around while fetching:
-                   this way you can change buffer_length before
-                   each execution, everything will work ok.
-                   On output: if length is set, mysql_stmt_fetch will
-                   write column length into it.
-
-  is_null        - On input: points to a boolean variable that should
-                   be set to TRUE for NULL values.
-                   This member is useful only if your data may be
-                   NULL in some but not all cases.
-                   If your data is never NULL, is_null should be set to 0.
-                   If your data is always NULL, set buffer_type
-                   to MYSQL_TYPE_NULL, and is_null will not be used.
-
-  is_unsigned    - On input: used to signify that values provided for one
-                   of numeric types are unsigned.
-                   On output describes signedness of the output buffer.
-                   If, taking into account is_unsigned flag, column data
-                   is out of range of the output buffer, data for this column
-                   is regarded truncated. Note that this has no correspondence
-                   to the sign of result set column, if you need to find it out
-                   use mysql_stmt_result_metadata.
-  error          - where to write a truncation error if it is present.
-                   possible error value is:
-                   0  no truncation
-                   1  value is out of range or buffer is too small
-
-  Please note that MYSQL_BIND also has internals members.
-*/
-
-typedef struct st_mysql_bind
-{
-  unsigned long	*length;          /* output length pointer */
-  my_bool       *is_null;	  /* Pointer to null indicator */
-  void		*buffer;	  /* buffer to get/put data */
-  /* set this if you want to track data truncations happened during fetch */
-  my_bool       *error;
-  enum enum_field_types buffer_type;	/* buffer type */
-  /* output buffer length, must be set when fetching str/binary */
-  unsigned long buffer_length;
-  unsigned char *row_ptr;         /* for the current data position */
-  unsigned long offset;           /* offset position for char/binary fetch */
-  unsigned long	length_value;     /* Used if length is 0 */
-  unsigned int	param_number;	  /* For null count and error messages */
-  unsigned int  pack_length;	  /* Internal length for packed data */
-  my_bool       error_value;      /* used if error is 0 */
-  my_bool       is_unsigned;      /* set if integer type is unsigned */
-  my_bool	long_data_used;	  /* If used with mysql_send_long_data */
-  my_bool	is_null_value;    /* Used if is_null is 0 */
-  void (*store_param_func)(NET *net, struct st_mysql_bind *param);
-  void (*fetch_result)(struct st_mysql_bind *, MYSQL_FIELD *,
-                       unsigned char **row);
-  void (*skip_result)(struct st_mysql_bind *, MYSQL_FIELD *,
-		      unsigned char **row);
-} MYSQL_BIND;
-
-
-/* statement handler */
-typedef struct st_mysql_stmt
-{
-  MEM_ROOT       mem_root;             /* root allocations */
-  LIST           list;                 /* list to keep track of all stmts */
-  MYSQL          *mysql;               /* connection handle */
-  MYSQL_BIND     *params;              /* input parameters */
-  MYSQL_BIND     *bind;                /* output parameters */
-  MYSQL_FIELD    *fields;              /* result set metadata */
-  MYSQL_DATA     result;               /* cached result set */
-  MYSQL_ROWS     *data_cursor;         /* current row in cached result */
-  /* copy of mysql->affected_rows after statement execution */
-  my_ulonglong   affected_rows;
-  my_ulonglong   insert_id;            /* copy of mysql->insert_id */
-  /*
-    mysql_stmt_fetch() calls this function to fetch one row (it's different
-    for buffered, unbuffered and cursor fetch).
-  */
-  int            (*read_row_func)(struct st_mysql_stmt *stmt, 
-                                  unsigned char **row);
-  unsigned long	 stmt_id;	       /* Id for prepared statement */
-  unsigned long  flags;                /* i.e. type of cursor to open */
-  unsigned long  prefetch_rows;        /* number of rows per one COM_FETCH */
-  /*
-    Copied from mysql->server_status after execute/fetch to know
-    server-side cursor status for this statement.
-  */
-  unsigned int   server_status;
-  unsigned int	 last_errno;	       /* error code */
-  unsigned int   param_count;          /* input parameter count */
-  unsigned int   field_count;          /* number of columns in result set */
-  enum enum_mysql_stmt_state state;    /* statement state */
-  char		 last_error[MYSQL_ERRMSG_SIZE]; /* error message */
-  char		 sqlstate[SQLSTATE_LENGTH+1];
-  /* Types of input parameters should be sent to server */
-  my_bool        send_types_to_server;
-  my_bool        bind_param_done;      /* input buffers were supplied */
-  unsigned char  bind_result_done;     /* output buffers were supplied */
-  /* mysql_stmt_close() had to cancel this result */
-  my_bool       unbuffered_fetch_cancelled;  
-  /*
-    Is set to true if we need to calculate field->max_length for 
-    metadata fields when doing mysql_stmt_store_result.
-  */
-  my_bool       update_max_length;     
-} MYSQL_STMT;
-
-enum enum_stmt_attr_type
-{
-  /*
-    When doing mysql_stmt_store_result calculate max_length attribute
-    of statement metadata. This is to be consistent with the old API, 
-    where this was done automatically.
-    In the new API we do that only by request because it slows down
-    mysql_stmt_store_result sufficiently.
-  */
-  STMT_ATTR_UPDATE_MAX_LENGTH,
-  /*
-    unsigned long with combination of cursor flags (read only, for update,
-    etc)
-  */
-  STMT_ATTR_CURSOR_TYPE,
-  /*
-    Amount of rows to retrieve from server per one fetch if using cursors.
-    Accepts unsigned long attribute in the range 1 - ulong_max
-  */
-  STMT_ATTR_PREFETCH_ROWS
-};
-
-
-typedef struct st_mysql_methods
-{
-  my_bool (*read_query_result)(MYSQL *mysql);
-  my_bool (*advanced_command)(MYSQL *mysql,
-			      enum enum_server_command command,
-			      const char *header,
-			      unsigned long header_length,
-			      const char *arg,
-			      unsigned long arg_length,
-			      my_bool skip_check);
-  MYSQL_DATA *(*read_rows)(MYSQL *mysql,MYSQL_FIELD *mysql_fields,
-			   unsigned int fields);
-  MYSQL_RES * (*use_result)(MYSQL *mysql);
-  void (*fetch_lengths)(unsigned long *to, 
-			MYSQL_ROW column, unsigned int field_count);
-  void (*flush_use_result)(MYSQL *mysql);
-#if !defined(MYSQL_SERVER) || defined(EMBEDDED_LIBRARY)
-  MYSQL_FIELD * (*list_fields)(MYSQL *mysql);
-  my_bool (*read_prepare_result)(MYSQL *mysql, MYSQL_STMT *stmt);
-  int (*stmt_execute)(MYSQL_STMT *stmt);
-  int (*read_binary_rows)(MYSQL_STMT *stmt);
-  int (*unbuffered_fetch)(MYSQL *mysql, char **row);
-  void (*free_embedded_thd)(MYSQL *mysql);
-  const char *(*read_statistics)(MYSQL *mysql);
-  my_bool (*next_result)(MYSQL *mysql);
-  int (*read_change_user_result)(MYSQL *mysql, char *buff, const char *passwd);
-  int (*read_rows_from_cursor)(MYSQL_STMT *stmt);
-#endif
-} MYSQL_METHODS;
-
-
-MYSQL_STMT * STDCALL mysql_stmt_init(MYSQL *mysql);
-int STDCALL mysql_stmt_prepare(MYSQL_STMT *stmt, const char *query,
-                               unsigned long length);
-int STDCALL mysql_stmt_execute(MYSQL_STMT *stmt);
-int STDCALL mysql_stmt_fetch(MYSQL_STMT *stmt);
-int STDCALL mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *bind, 
-                                    unsigned int column,
-                                    unsigned long offset);
-int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt);
-unsigned long STDCALL mysql_stmt_param_count(MYSQL_STMT * stmt);
-my_bool STDCALL mysql_stmt_attr_set(MYSQL_STMT *stmt,
-                                    enum enum_stmt_attr_type attr_type,
-                                    const void *attr);
-my_bool STDCALL mysql_stmt_attr_get(MYSQL_STMT *stmt,
-                                    enum enum_stmt_attr_type attr_type,
-                                    void *attr);
-my_bool STDCALL mysql_stmt_bind_param(MYSQL_STMT * stmt, MYSQL_BIND * bnd);
-my_bool STDCALL mysql_stmt_bind_result(MYSQL_STMT * stmt, MYSQL_BIND * bnd);
-my_bool STDCALL mysql_stmt_close(MYSQL_STMT * stmt);
-my_bool STDCALL mysql_stmt_reset(MYSQL_STMT * stmt);
-my_bool STDCALL mysql_stmt_free_result(MYSQL_STMT *stmt);
-my_bool STDCALL mysql_stmt_send_long_data(MYSQL_STMT *stmt, 
-                                          unsigned int param_number,
-                                          const char *data, 
-                                          unsigned long length);
-MYSQL_RES *STDCALL mysql_stmt_result_metadata(MYSQL_STMT *stmt);
-MYSQL_RES *STDCALL mysql_stmt_param_metadata(MYSQL_STMT *stmt);
-unsigned int STDCALL mysql_stmt_errno(MYSQL_STMT * stmt);
-const char *STDCALL mysql_stmt_error(MYSQL_STMT * stmt);
-const char *STDCALL mysql_stmt_sqlstate(MYSQL_STMT * stmt);
-MYSQL_ROW_OFFSET STDCALL mysql_stmt_row_seek(MYSQL_STMT *stmt, 
-                                             MYSQL_ROW_OFFSET offset);
-MYSQL_ROW_OFFSET STDCALL mysql_stmt_row_tell(MYSQL_STMT *stmt);
-void STDCALL mysql_stmt_data_seek(MYSQL_STMT *stmt, my_ulonglong offset);
-my_ulonglong STDCALL mysql_stmt_num_rows(MYSQL_STMT *stmt);
-my_ulonglong STDCALL mysql_stmt_affected_rows(MYSQL_STMT *stmt);
-my_ulonglong STDCALL mysql_stmt_insert_id(MYSQL_STMT *stmt);
-unsigned int STDCALL mysql_stmt_field_count(MYSQL_STMT *stmt);
-
-my_bool STDCALL mysql_commit(MYSQL * mysql);
-my_bool STDCALL mysql_rollback(MYSQL * mysql);
-my_bool STDCALL mysql_autocommit(MYSQL * mysql, my_bool auto_mode);
-my_bool STDCALL mysql_more_results(MYSQL *mysql);
-int STDCALL mysql_next_result(MYSQL *mysql);
-void STDCALL mysql_close(MYSQL *sock);
-
-
-/* status return codes */
-#define MYSQL_NO_DATA        100
-#define MYSQL_DATA_TRUNCATED 101
-
-#define mysql_reload(mysql) mysql_refresh((mysql),REFRESH_GRANT)
-
-#ifdef USE_OLD_FUNCTIONS
-MYSQL *		STDCALL mysql_connect(MYSQL *mysql, const char *host,
-				      const char *user, const char *passwd);
-int		STDCALL mysql_create_db(MYSQL *mysql, const char *DB);
-int		STDCALL mysql_drop_db(MYSQL *mysql, const char *DB);
-#define	 mysql_reload(mysql) mysql_refresh((mysql),REFRESH_GRANT)
-#endif
-#define HAVE_MYSQL_REAL_CONNECT
-
-/*
-  The following functions are mainly exported because of mysqlbinlog;
-  They are not for general usage
-*/
-
-#define simple_command(mysql, command, arg, length, skip_check) \
-  (*(mysql)->methods->advanced_command)(mysql, command,         \
-					NullS, 0, arg, length, skip_check)
-unsigned long net_safe_read(MYSQL* mysql);
-
-#ifdef __NETWARE__
-#pragma pack(pop)		/* restore alignment */
-#endif
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif /* _mysql_h */
diff --git a/src/mysql/mysql_com.h b/src/mysql/mysql_com.h
deleted file mode 100644
index ec1c13379..000000000
--- a/src/mysql/mysql_com.h
+++ /dev/null
@@ -1,452 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/*
-** Common definition between mysql server & client
-*/
-
-#ifndef _mysql_com_h
-#define _mysql_com_h
-
-#define NAME_LEN	64		/* Field/table name length */
-#define HOSTNAME_LENGTH 60
-#define USERNAME_LENGTH 16
-#define SERVER_VERSION_LENGTH 60
-#define SQLSTATE_LENGTH 5
-
-/*
-  USER_HOST_BUFF_SIZE -- length of string buffer, that is enough to contain
-  username and hostname parts of the user identifier with trailing zero in
-  MySQL standard format:
-  user_name_part@host_name_part\0
-*/
-#define USER_HOST_BUFF_SIZE HOSTNAME_LENGTH + USERNAME_LENGTH + 2
-
-#define LOCAL_HOST	"localhost"
-#define LOCAL_HOST_NAMEDPIPE "."
-
-
-#if defined(__WIN__) && !defined( _CUSTOMCONFIG_)
-#define MYSQL_NAMEDPIPE "MySQL"
-#define MYSQL_SERVICENAME "MySQL"
-#endif /* __WIN__ */
-
-/*
-  You should add new commands to the end of this list, otherwise old
-  servers won't be able to handle them as 'unsupported'.
-*/
-
-enum enum_server_command
-{
-  COM_SLEEP, COM_QUIT, COM_INIT_DB, COM_QUERY, COM_FIELD_LIST,
-  COM_CREATE_DB, COM_DROP_DB, COM_REFRESH, COM_SHUTDOWN, COM_STATISTICS,
-  COM_PROCESS_INFO, COM_CONNECT, COM_PROCESS_KILL, COM_DEBUG, COM_PING,
-  COM_TIME, COM_DELAYED_INSERT, COM_CHANGE_USER, COM_BINLOG_DUMP,
-  COM_TABLE_DUMP, COM_CONNECT_OUT, COM_REGISTER_SLAVE,
-  COM_STMT_PREPARE, COM_STMT_EXECUTE, COM_STMT_SEND_LONG_DATA, COM_STMT_CLOSE,
-  COM_STMT_RESET, COM_SET_OPTION, COM_STMT_FETCH,
-  /* don't forget to update const char *command_name[] in sql_parse.cc */
-
-  /* Must be last */
-  COM_END
-};
-
-
-/*
-  Length of random string sent by server on handshake; this is also length of
-  obfuscated password, recieved from client
-*/
-#define SCRAMBLE_LENGTH 20
-#define SCRAMBLE_LENGTH_323 8
-/* length of password stored in the db: new passwords are preceeded with '*' */
-#define SCRAMBLED_PASSWORD_CHAR_LENGTH (SCRAMBLE_LENGTH*2+1)
-#define SCRAMBLED_PASSWORD_CHAR_LENGTH_323 (SCRAMBLE_LENGTH_323*2)
-
-
-#define NOT_NULL_FLAG	1		/* Field can't be NULL */
-#define PRI_KEY_FLAG	2		/* Field is part of a primary key */
-#define UNIQUE_KEY_FLAG 4		/* Field is part of a unique key */
-#define MULTIPLE_KEY_FLAG 8		/* Field is part of a key */
-#define BLOB_FLAG	16		/* Field is a blob */
-#define UNSIGNED_FLAG	32		/* Field is unsigned */
-#define ZEROFILL_FLAG	64		/* Field is zerofill */
-#define BINARY_FLAG	128		/* Field is binary   */
-
-/* The following are only sent to new clients */
-#define ENUM_FLAG	256		/* field is an enum */
-#define AUTO_INCREMENT_FLAG 512		/* field is a autoincrement field */
-#define TIMESTAMP_FLAG	1024		/* Field is a timestamp */
-#define SET_FLAG	2048		/* field is a set */
-#define NO_DEFAULT_VALUE_FLAG 4096	/* Field doesn't have default value */
-#define NUM_FLAG	32768		/* Field is num (for clients) */
-#define PART_KEY_FLAG	16384		/* Intern; Part of some key */
-#define GROUP_FLAG	32768		/* Intern: Group field */
-#define UNIQUE_FLAG	65536		/* Intern: Used by sql_yacc */
-#define BINCMP_FLAG	131072		/* Intern: Used by sql_yacc */
-
-#define REFRESH_GRANT		1	/* Refresh grant tables */
-#define REFRESH_LOG		2	/* Start on new log file */
-#define REFRESH_TABLES		4	/* close all tables */
-#define REFRESH_HOSTS		8	/* Flush host cache */
-#define REFRESH_STATUS		16	/* Flush status variables */
-#define REFRESH_THREADS		32	/* Flush thread cache */
-#define REFRESH_SLAVE           64      /* Reset master info and restart slave
-					   thread */
-#define REFRESH_MASTER          128     /* Remove all bin logs in the index
-					   and truncate the index */
-
-/* The following can't be set with mysql_refresh() */
-#define REFRESH_READ_LOCK	16384	/* Lock tables for read */
-#define REFRESH_FAST		32768	/* Intern flag */
-
-/* RESET (remove all queries) from query cache */
-#define REFRESH_QUERY_CACHE	65536
-#define REFRESH_QUERY_CACHE_FREE 0x20000L /* pack query cache */
-#define REFRESH_DES_KEY_FILE	0x40000L
-#define REFRESH_USER_RESOURCES	0x80000L
-
-#define CLIENT_LONG_PASSWORD	1	/* new more secure passwords */
-#define CLIENT_FOUND_ROWS	2	/* Found instead of affected rows */
-#define CLIENT_LONG_FLAG	4	/* Get all column flags */
-#define CLIENT_CONNECT_WITH_DB	8	/* One can specify db on connect */
-#define CLIENT_NO_SCHEMA	16	/* Don't allow database.table.column */
-#define CLIENT_COMPRESS		32	/* Can use compression protocol */
-#define CLIENT_ODBC		64	/* Odbc client */
-#define CLIENT_LOCAL_FILES	128	/* Can use LOAD DATA LOCAL */
-#define CLIENT_IGNORE_SPACE	256	/* Ignore spaces before '(' */
-#define CLIENT_PROTOCOL_41	512	/* New 4.1 protocol */
-#define CLIENT_INTERACTIVE	1024	/* This is an interactive client */
-#define CLIENT_SSL              2048	/* Switch to SSL after handshake */
-#define CLIENT_IGNORE_SIGPIPE   4096    /* IGNORE sigpipes */
-#define CLIENT_TRANSACTIONS	8192	/* Client knows about transactions */
-#define CLIENT_RESERVED         16384   /* Old flag for 4.1 protocol  */
-#define CLIENT_SECURE_CONNECTION 32768  /* New 4.1 authentication */
-#define CLIENT_MULTI_STATEMENTS 65536   /* Enable/disable multi-stmt support */
-#define CLIENT_MULTI_RESULTS    131072  /* Enable/disable multi-results */
-#define CLIENT_REMEMBER_OPTIONS	(((ulong) 1) << 31)
-
-#define SERVER_STATUS_IN_TRANS     1	/* Transaction has started */
-#define SERVER_STATUS_AUTOCOMMIT   2	/* Server in auto_commit mode */
-#define SERVER_STATUS_MORE_RESULTS 4	/* More results on server */
-#define SERVER_MORE_RESULTS_EXISTS 8    /* Multi query - next query exists */
-#define SERVER_QUERY_NO_GOOD_INDEX_USED 16
-#define SERVER_QUERY_NO_INDEX_USED      32
-/*
-  The server was able to fulfill the clients request and opened a
-  read-only non-scrollable cursor for a query. This flag comes
-  in reply to COM_STMT_EXECUTE and COM_STMT_FETCH commands.
-*/
-#define SERVER_STATUS_CURSOR_EXISTS 64
-/*
-  This flag is sent when a read-only cursor is exhausted, in reply to
-  COM_STMT_FETCH command.
-*/
-#define SERVER_STATUS_LAST_ROW_SENT 128
-#define SERVER_STATUS_DB_DROPPED        256 /* A database was dropped */
-#define SERVER_STATUS_NO_BACKSLASH_ESCAPES 512
-
-#define MYSQL_ERRMSG_SIZE	512
-#define NET_READ_TIMEOUT	30		/* Timeout on read */
-#define NET_WRITE_TIMEOUT	60		/* Timeout on write */
-#define NET_WAIT_TIMEOUT	8*60*60		/* Wait for new query */
-
-#define ONLY_KILL_QUERY         1
-
-struct st_vio;					/* Only C */
-typedef struct st_vio Vio;
-
-#define MAX_TINYINT_WIDTH       3       /* Max width for a TINY w.o. sign */
-#define MAX_SMALLINT_WIDTH      5       /* Max width for a SHORT w.o. sign */
-#define MAX_MEDIUMINT_WIDTH     8       /* Max width for a INT24 w.o. sign */
-#define MAX_INT_WIDTH           10      /* Max width for a LONG w.o. sign */
-#define MAX_BIGINT_WIDTH        20      /* Max width for a LONGLONG */
-#define MAX_CHAR_WIDTH		255	/* Max length for a CHAR colum */
-#define MAX_BLOB_WIDTH		8192	/* Default width for blob */
-
-typedef struct st_net {
-#if !defined(CHECK_EMBEDDED_DIFFERENCES) || !defined(EMBEDDED_LIBRARY)
-  Vio* vio;
-  unsigned char *buff,*buff_end,*write_pos,*read_pos;
-  my_socket fd;					/* For Perl DBI/dbd */
-  unsigned long max_packet,max_packet_size;
-  unsigned int pkt_nr,compress_pkt_nr;
-  unsigned int write_timeout, read_timeout, retry_count;
-  int fcntl;
-  my_bool compress;
-  /*
-    The following variable is set if we are doing several queries in one
-    command ( as in LOAD TABLE ... FROM MASTER ),
-    and do not want to confuse the client with OK at the wrong time
-  */
-  unsigned long remain_in_buf,length, buf_length, where_b;
-  unsigned int *return_status;
-  unsigned char reading_or_writing;
-  char save_char;
-  my_bool no_send_ok;  /* For SPs and other things that do multiple stmts */
-  my_bool no_send_eof; /* For SPs' first version read-only cursors */
-  /*
-    Set if OK packet is already sent, and we do not need to send error
-    messages
-  */
-  my_bool no_send_error;
-  /*
-    Pointer to query object in query cache, do not equal NULL (0) for
-    queries in cache that have not stored its results yet
-  */
-#endif
-  char last_error[MYSQL_ERRMSG_SIZE], sqlstate[SQLSTATE_LENGTH+1];
-  unsigned int last_errno;
-  unsigned char error;
-  gptr query_cache_query;
-  my_bool report_error; /* We should report error (we have unreported error) */
-  my_bool return_errno;
-} NET;
-
-#define packet_error (~(unsigned long) 0)
-
-enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY,
-			MYSQL_TYPE_SHORT,  MYSQL_TYPE_LONG,
-			MYSQL_TYPE_FLOAT,  MYSQL_TYPE_DOUBLE,
-			MYSQL_TYPE_NULL,   MYSQL_TYPE_TIMESTAMP,
-			MYSQL_TYPE_LONGLONG,MYSQL_TYPE_INT24,
-			MYSQL_TYPE_DATE,   MYSQL_TYPE_TIME,
-			MYSQL_TYPE_DATETIME, MYSQL_TYPE_YEAR,
-			MYSQL_TYPE_NEWDATE, MYSQL_TYPE_VARCHAR,
-			MYSQL_TYPE_BIT,
-                        MYSQL_TYPE_NEWDECIMAL=246,
-			MYSQL_TYPE_ENUM=247,
-			MYSQL_TYPE_SET=248,
-			MYSQL_TYPE_TINY_BLOB=249,
-			MYSQL_TYPE_MEDIUM_BLOB=250,
-			MYSQL_TYPE_LONG_BLOB=251,
-			MYSQL_TYPE_BLOB=252,
-			MYSQL_TYPE_VAR_STRING=253,
-			MYSQL_TYPE_STRING=254,
-			MYSQL_TYPE_GEOMETRY=255
-
-};
-
-/* For backward compatibility */
-#define CLIENT_MULTI_QUERIES    CLIENT_MULTI_STATEMENTS    
-#define FIELD_TYPE_DECIMAL     MYSQL_TYPE_DECIMAL
-#define FIELD_TYPE_NEWDECIMAL  MYSQL_TYPE_NEWDECIMAL
-#define FIELD_TYPE_TINY        MYSQL_TYPE_TINY
-#define FIELD_TYPE_SHORT       MYSQL_TYPE_SHORT
-#define FIELD_TYPE_LONG        MYSQL_TYPE_LONG
-#define FIELD_TYPE_FLOAT       MYSQL_TYPE_FLOAT
-#define FIELD_TYPE_DOUBLE      MYSQL_TYPE_DOUBLE
-#define FIELD_TYPE_NULL        MYSQL_TYPE_NULL
-#define FIELD_TYPE_TIMESTAMP   MYSQL_TYPE_TIMESTAMP
-#define FIELD_TYPE_LONGLONG    MYSQL_TYPE_LONGLONG
-#define FIELD_TYPE_INT24       MYSQL_TYPE_INT24
-#define FIELD_TYPE_DATE        MYSQL_TYPE_DATE
-#define FIELD_TYPE_TIME        MYSQL_TYPE_TIME
-#define FIELD_TYPE_DATETIME    MYSQL_TYPE_DATETIME
-#define FIELD_TYPE_YEAR        MYSQL_TYPE_YEAR
-#define FIELD_TYPE_NEWDATE     MYSQL_TYPE_NEWDATE
-#define FIELD_TYPE_ENUM        MYSQL_TYPE_ENUM
-#define FIELD_TYPE_SET         MYSQL_TYPE_SET
-#define FIELD_TYPE_TINY_BLOB   MYSQL_TYPE_TINY_BLOB
-#define FIELD_TYPE_MEDIUM_BLOB MYSQL_TYPE_MEDIUM_BLOB
-#define FIELD_TYPE_LONG_BLOB   MYSQL_TYPE_LONG_BLOB
-#define FIELD_TYPE_BLOB        MYSQL_TYPE_BLOB
-#define FIELD_TYPE_VAR_STRING  MYSQL_TYPE_VAR_STRING
-#define FIELD_TYPE_STRING      MYSQL_TYPE_STRING
-#define FIELD_TYPE_CHAR        MYSQL_TYPE_TINY
-#define FIELD_TYPE_INTERVAL    MYSQL_TYPE_ENUM
-#define FIELD_TYPE_GEOMETRY    MYSQL_TYPE_GEOMETRY
-#define FIELD_TYPE_BIT         MYSQL_TYPE_BIT
-
-
-/* Shutdown/kill enums and constants */ 
-
-/* Bits for THD::killable. */
-#define MYSQL_SHUTDOWN_KILLABLE_CONNECT    (unsigned char)(1 << 0)
-#define MYSQL_SHUTDOWN_KILLABLE_TRANS      (unsigned char)(1 << 1)
-#define MYSQL_SHUTDOWN_KILLABLE_LOCK_TABLE (unsigned char)(1 << 2)
-#define MYSQL_SHUTDOWN_KILLABLE_UPDATE     (unsigned char)(1 << 3)
-
-enum mysql_enum_shutdown_level {
-  /*
-    We want levels to be in growing order of hardness (because we use number
-    comparisons). Note that DEFAULT does not respect the growing property, but
-    it's ok.
-  */
-  SHUTDOWN_DEFAULT = 0,
-  /* wait for existing connections to finish */
-  SHUTDOWN_WAIT_CONNECTIONS= MYSQL_SHUTDOWN_KILLABLE_CONNECT,
-  /* wait for existing trans to finish */
-  SHUTDOWN_WAIT_TRANSACTIONS= MYSQL_SHUTDOWN_KILLABLE_TRANS,
-  /* wait for existing updates to finish (=> no partial MyISAM update) */
-  SHUTDOWN_WAIT_UPDATES= MYSQL_SHUTDOWN_KILLABLE_UPDATE,
-  /* flush InnoDB buffers and other storage engines' buffers*/
-  SHUTDOWN_WAIT_ALL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1),
-  /* don't flush InnoDB buffers, flush other storage engines' buffers*/
-  SHUTDOWN_WAIT_CRITICAL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1) + 1,
-  /* Now the 2 levels of the KILL command */
-#if MYSQL_VERSION_ID >= 50000
-  KILL_QUERY= 254,
-#endif
-  KILL_CONNECTION= 255
-};
-
-
-enum enum_cursor_type
-{
-  CURSOR_TYPE_NO_CURSOR= 0,
-  CURSOR_TYPE_READ_ONLY= 1,
-  CURSOR_TYPE_FOR_UPDATE= 2,
-  CURSOR_TYPE_SCROLLABLE= 4
-};
-
-
-/* options for mysql_set_option */
-enum enum_mysql_set_option
-{
-  MYSQL_OPTION_MULTI_STATEMENTS_ON,
-  MYSQL_OPTION_MULTI_STATEMENTS_OFF
-};
-
-#define net_new_transaction(net) ((net)->pkt_nr=0)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-my_bool	my_net_init(NET *net, Vio* vio);
-void	my_net_local_init(NET *net);
-void	net_end(NET *net);
-void	net_clear(NET *net);
-my_bool net_realloc(NET *net, unsigned long length);
-my_bool	net_flush(NET *net);
-my_bool	my_net_write(NET *net,const char *packet,unsigned long len);
-my_bool	net_write_command(NET *net,unsigned char command,
-			  const char *header, unsigned long head_len,
-			  const char *packet, unsigned long len);
-int	net_real_write(NET *net,const char *packet,unsigned long len);
-unsigned long my_net_read(NET *net);
-
-/*
-  The following function is not meant for normal usage
-  Currently it's used internally by manager.c
-*/
-struct sockaddr;
-int my_connect(my_socket s, const struct sockaddr *name, unsigned int namelen,
-	       unsigned int timeout);
-
-struct rand_struct {
-  unsigned long seed1,seed2,max_value;
-  double max_value_dbl;
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-  /* The following is for user defined functions */
-
-enum Item_result {STRING_RESULT=0, REAL_RESULT, INT_RESULT, ROW_RESULT,
-                  DECIMAL_RESULT};
-
-typedef struct st_udf_args
-{
-  unsigned int arg_count;		/* Number of arguments */
-  enum Item_result *arg_type;		/* Pointer to item_results */
-  char **args;				/* Pointer to argument */
-  unsigned long *lengths;		/* Length of string arguments */
-  char *maybe_null;			/* Set to 1 for all maybe_null args */
-  char **attributes;                    /* Pointer to attribute name */
-  unsigned long *attribute_lengths;     /* Length of attribute arguments */
-} UDF_ARGS;
-
-  /* This holds information about the result */
-
-typedef struct st_udf_init
-{
-  my_bool maybe_null;			/* 1 if function can return NULL */
-  unsigned int decimals;		/* for real functions */
-  unsigned long max_length;		/* For string functions */
-  char	  *ptr;				/* free pointer for function data */
-  my_bool const_item;			/* 0 if result is independent of arguments */
-} UDF_INIT;
-
-  /* Constants when using compression */
-#define NET_HEADER_SIZE 4		/* standard header size */
-#define COMP_HEADER_SIZE 3		/* compression header extra size */
-
-  /* Prototypes to password functions */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-  These functions are used for authentication by client and server and
-  implemented in sql/password.c
-*/
-
-void randominit(struct rand_struct *, unsigned long seed1,
-                unsigned long seed2);
-double my_rnd(struct rand_struct *);
-void create_random_string(char *to, unsigned int length, struct rand_struct *rand_st);
-
-void hash_password(unsigned long *to, const char *password, unsigned int password_len);
-void make_scrambled_password_323(char *to, const char *password);
-void scramble_323(char *to, const char *message, const char *password);
-my_bool check_scramble_323(const char *, const char *message,
-                           unsigned long *salt);
-void get_salt_from_password_323(unsigned long *res, const char *password);
-void make_password_from_salt_323(char *to, const unsigned long *salt);
-
-void make_scrambled_password(char *to, const char *password);
-void scramble(char *to, const char *message, const char *password);
-my_bool check_scramble(const char *reply, const char *message,
-                       const unsigned char *hash_stage2);
-void get_salt_from_password(unsigned char *res, const char *password);
-void make_password_from_salt(char *to, const unsigned char *hash_stage2);
-char *octet2hex(char *to, const char *str, unsigned int len);
-
-/* end of password.c */
-
-char *get_tty_password(char *opt_message);
-const char *mysql_errno_to_sqlstate(unsigned int mysql_errno);
-
-/* Some other useful functions */
-
-my_bool my_init(void);
-extern int modify_defaults_file(const char *file_location, const char *option,
-                                const char *option_value,
-                                const char *section_name, int remove_option);
-int load_defaults(const char *conf_file, const char **groups,
-		  int *argc, char ***argv);
-my_bool my_thread_init(void);
-void my_thread_end(void);
-
-#ifdef _global_h
-ulong STDCALL net_field_length(uchar **packet);
-my_ulonglong net_field_length_ll(uchar **packet);
-char *net_store_length(char *pkg, ulonglong length);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#define NULL_LENGTH ((unsigned long) ~0) /* For net_store_length */
-#define MYSQL_STMT_HEADER       4
-#define MYSQL_LONG_DATA_HEADER  6
-
-#endif
diff --git a/src/mysql/mysql_time.h b/src/mysql/mysql_time.h
deleted file mode 100644
index 5f4fc12c0..000000000
--- a/src/mysql/mysql_time.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright (C) 2004 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifndef _mysql_time_h_
-#define _mysql_time_h_
-
-/*
-  Time declarations shared between the server and client API:
-  you should not add anything to this header unless it's used
-  (and hence should be visible) in mysql.h.
-  If you're looking for a place to add new time-related declaration,
-  it's most likely my_time.h. See also "C API Handling of Date
-  and Time Values" chapter in documentation.
-*/
-
-enum enum_mysql_timestamp_type
-{
-  MYSQL_TIMESTAMP_NONE= -2, MYSQL_TIMESTAMP_ERROR= -1,
-  MYSQL_TIMESTAMP_DATE= 0, MYSQL_TIMESTAMP_DATETIME= 1, MYSQL_TIMESTAMP_TIME= 2
-};
-
-
-/*
-  Structure which is used to represent datetime values inside MySQL.
-
-  We assume that values in this structure are normalized, i.e. year <= 9999,
-  month <= 12, day <= 31, hour <= 23, hour <= 59, hour <= 59. Many functions
-  in server such as my_system_gmt_sec() or make_time() family of functions
-  rely on this (actually now usage of make_*() family relies on a bit weaker
-  restriction). Also functions that produce MYSQL_TIME as result ensure this.
-  There is one exception to this rule though if this structure holds time
-  value (time_type == MYSQL_TIMESTAMP_TIME) days and hour member can hold
-  bigger values.
-*/
-typedef struct st_mysql_time
-{
-  unsigned int  year, month, day, hour, minute, second;
-  unsigned long second_part;
-  my_bool       neg;
-  enum enum_mysql_timestamp_type time_type;
-} MYSQL_TIME;
-
-#endif /* _mysql_time_h_ */
diff --git a/src/mysql/mysql_version.h b/src/mysql/mysql_version.h
deleted file mode 100644
index 473a19987..000000000
--- a/src/mysql/mysql_version.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright Abandoned 1996, 1999, 2001 MySQL AB
-   This file is public domain and comes with NO WARRANTY of any kind */
-
-/* Version numbers for protocol & mysqld */
-
-#ifndef _mysql_version_h
-#define _mysql_version_h
-#ifdef _CUSTOMCONFIG_
-#include <custom_conf.h>
-#else
-#define PROTOCOL_VERSION		10
-#define MYSQL_SERVER_VERSION		"5.0.20"
-#define MYSQL_BASE_VERSION		"mysqld-5.0"
-#define MYSQL_SERVER_SUFFIX_DEF	"-community-max-nt"
-#define FRM_VER				6
-#define MYSQL_VERSION_ID		50020
-#define MYSQL_PORT			3306
-#define MYSQL_UNIX_ADDR			"/tmp/mysql.sock"
-#define MYSQL_CONFIG_NAME		"my"
-#define MYSQL_COMPILATION_COMMENT	"MySQL Community Edition - Max (GPL)"
-
-/* mysqld compile time options */
-#endif /* _CUSTOMCONFIG_ */
-
-#ifndef LICENSE
-#define LICENSE				GPL
-#endif /* LICENSE */
-
-#endif /* _mysql_version_h */
diff --git a/src/mysql/raid.h b/src/mysql/raid.h
deleted file mode 100644
index c840afcba..000000000
--- a/src/mysql/raid.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/* Parser needs these defines  always, even if USE_RAID is not defined */
-#define RAID_TYPE_0 1       /* Striping */
-#define RAID_TYPE_x 2       /* Some new modes */
-#define RAID_TYPE_y 3
-
-#define RAID_DEFAULT_CHUNKS 4
-#define RAID_DEFAULT_CHUNKSIZE 256*1024 /* 256kB */
-
-C_MODE_START
-#define my_raid_type(raid_type)  raid_type_string[(int)(raid_type)]
-extern const char *raid_type_string[];
-C_MODE_END
-
-#ifdef DONT_USE_RAID
-#undef USE_RAID
-#endif
-#if defined(USE_RAID)
-
-#include "my_dir.h"
-
-/* Trap all occurences of my_...() in source and use our wrapper around this function */
-
-#ifdef MAP_TO_USE_RAID
-#define my_read(A,B,C,D)     my_raid_read(A,B,C,D)
-#define my_write(A,B,C,D)    my_raid_write(A,B,C,D)
-#define my_pwrite(A,B,C,D,E) my_raid_pwrite(A,B,C,D,E)
-#define my_pread(A,B,C,D,E)  my_raid_pread(A,B,C,D,E)
-#define my_chsize(A,B,C,D)   my_raid_chsize(A,B,C,D)
-#define my_close(A,B)        my_raid_close(A,B)
-#define my_tell(A,B)         my_raid_tell(A,B)
-#define my_seek(A,B,C,D)     my_raid_seek(A,B,C,D)
-#define my_lock(A,B,C,D,E)     my_raid_lock(A,B,C,D,E)
-#define my_fstat(A,B,C)     my_raid_fstat(A,B,C)
-#endif /* MAP_TO_USE_RAID */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-  void init_raid(void);
-  void end_raid(void);
-
-  bool is_raid(File fd);
-  File my_raid_create(const char *FileName, int CreateFlags, int access_flags,
-		      uint raid_type, uint raid_chunks, ulong raid_chunksize,
-		      myf MyFlags);
-  File my_raid_open(const char *FileName, int Flags,
-		    uint raid_type, uint raid_chunks, ulong raid_chunksize,
-		    myf MyFlags);
-  int my_raid_rename(const char *from, const char *to, uint raid_chunks,
-		     myf MyFlags);
-  int my_raid_delete(const char *from, uint raid_chunks, myf MyFlags);
-  int my_raid_redel(const char *old_name, const char *new_name,
-		    uint raid_chunks, myf MyFlags);
-
-  my_off_t my_raid_seek(File fd, my_off_t pos, int whence, myf MyFlags);
-  my_off_t my_raid_tell(File fd, myf MyFlags);
-
-  uint my_raid_write(File,const byte *Buffer, uint Count, myf MyFlags);
-  uint my_raid_read(File Filedes, byte *Buffer, uint Count, myf MyFlags);
-
-  uint my_raid_pread(File Filedes, byte *Buffer, uint Count, my_off_t offset,
-		     myf MyFlags);
-  uint my_raid_pwrite(int Filedes, const byte *Buffer, uint Count,
-		      my_off_t offset, myf MyFlags);
-
-  int my_raid_lock(File,int locktype, my_off_t start, my_off_t length,
-		   myf MyFlags);
-  int my_raid_chsize(File fd, my_off_t newlength, int filler, myf MyFlags);
-  int my_raid_close(File, myf MyFlags);
-  int my_raid_fstat(int Filedes, struct stat *buf,  myf MyFlags);
-
-#ifdef __cplusplus
-}
-
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface			/* gcc class implementation */
-#endif
-
-class RaidName {
-  public:
-    RaidName(const char *FileName);
-    ~RaidName();
-    bool IsRaid();
-    int Rename(const char * from, const char * to, myf MyFlags);
-  private:
-    uint _raid_type;       /* RAID_TYPE_0 or RAID_TYPE_1 or RAID_TYPE_5 */
-    uint _raid_chunks;     /* 1..n */
-    ulong _raid_chunksize; /* 1..n in bytes */
-};
-
-class RaidFd {
-  public:
-    RaidFd(uint raid_type, uint raid_chunks , ulong raid_chunksize);
-    ~RaidFd();
-    File Create(const char *FileName, int CreateFlags, int access_flags,
-		myf MyFlags);
-    File Open(const char *FileName, int Flags, myf MyFlags);
-    my_off_t Seek(my_off_t pos,int whence,myf MyFlags);
-    my_off_t Tell(myf MyFlags);
-    int Write(const byte *Buffer, uint Count, myf MyFlags);
-    int Read(const byte *Buffer, uint Count, myf MyFlags);
-    int Lock(int locktype, my_off_t start, my_off_t length, myf MyFlags);
-    int Chsize(File fd, my_off_t newlength, int filler, myf MyFlags);
-    int Fstat(int fd, MY_STAT *stat_area, myf MyFlags );
-    int Close(myf MyFlags);
-    static bool IsRaid(File fd);
-    static DYNAMIC_ARRAY _raid_map;		/* Map of RaidFD* */
-  private:
-
-    uint _raid_type;       /* RAID_TYPE_0 or RAID_TYPE_1 or RAID_TYPE_5 */
-    uint _raid_chunks;     /* 1..n */
-    ulong _raid_chunksize; /* 1..n in bytes */
-
-    ulong _total_block;    /* We are operating with block no x (can be 0..many). */
-    uint _this_block;      /* can be 0.._raid_chunks */
-    uint _remaining_bytes; /* Maximum bytes that can be written in this block */
-
-    my_off_t _position;
-    my_off_t _size;        /* Cached file size for faster seek(SEEK_END) */
-    File _fd;
-    File *_fd_vector;		/* Array of File */
-    off_t *_seek_vector;	/* Array of cached seek positions */
-
-    inline void Calculate()
-    {
-      DBUG_ENTER("RaidFd::_Calculate");
-      DBUG_PRINT("info",("_position: %lu _raid_chunksize: %d, _size: %lu",
-			 (ulong) _position, _raid_chunksize, (ulong) _size));
-
-      _total_block = (ulong) (_position / _raid_chunksize);
-      _this_block = _total_block % _raid_chunks;    /* can be 0.._raid_chunks */
-      _remaining_bytes = (uint) (_raid_chunksize -
-				 (_position - _total_block * _raid_chunksize));
-      DBUG_PRINT("info",
-		 ("_total_block: %d  this_block: %d  _remaining_bytes:%d",
-		  _total_block, _this_block, _remaining_bytes));
-      DBUG_VOID_RETURN;
-    }
-};
-
-#endif /* __cplusplus */
-#endif /* USE_RAID */
diff --git a/src/mysql/typelib.h b/src/mysql/typelib.h
deleted file mode 100644
index 4d6a90ad5..000000000
--- a/src/mysql/typelib.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-
-#ifndef _typelib_h
-#define _typelib_h
-
-typedef struct st_typelib {	/* Different types saved here */
-  unsigned int count;		/* How many types */
-  const char *name;		/* Name of typelib */
-  const char **type_names;
-  unsigned int *type_lengths;
-} TYPELIB;
-
-extern int find_type(char *x,TYPELIB *typelib,unsigned int full_name);
-extern void make_type(char *to,unsigned int nr,TYPELIB *typelib);
-extern const char *get_type(TYPELIB *typelib,unsigned int nr);
-
-extern TYPELIB sql_protocol_typelib;
-
-#endif /* _typelib_h */
diff --git a/src/txt-converter/login-converter.c b/src/txt-converter/login-converter.c
index edd59d77b..78717287d 100644
--- a/src/txt-converter/login-converter.c
+++ b/src/txt-converter/login-converter.c
@@ -1,157 +1,50 @@
 // (c) eAthena Dev Team - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
+#define WITH_TXT
+#define WITH_SQL
+
 #include "../common/cbasetypes.h"
-#include "../common/mmo.h"
+#include "../common/mmo.h" // struct mmo_account
 #include "../common/core.h"
-#include "../common/db.h"
 #include "../common/showmsg.h"
-#include "../common/sql.h"
-#include "../common/malloc.h"
-
+#include "../login/account.h"
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-char login_account_id[256]="account_id";
-char login_userid[256]="userid";
-char login_user_pass[256]="user_pass";
-char login_db[256]="login";
-char globalreg_db[256]="global_reg_value";
-
-static DBMap* gm_account_db=NULL; // int account_id -> struct gm_account*
+#define LOGIN_CONF_NAME "conf/login_athena.conf"
 
-int db_server_port = 3306;
-char db_server_ip[32] = "127.0.0.1";
-char db_server_id[32] = "ragnarok";
-char db_server_pw[32] = "ragnarok";
-char db_server_logindb[32] = "ragnarok";
+AccountDB* txtdb = NULL;
+AccountDB* sqldb = NULL;
 
-#define INTER_CONF_NAME "conf/inter_athena.conf"
-#define GM_ACCOUNT_NAME "conf/GM_account.txt"
-#define ACCOUNT_TXT_NAME "save/account.txt"
 //--------------------------------------------------------
 
-int isGM(int account_id)
-{
-	struct gm_account* p = (struct gm_account*)idb_get(gm_account_db,account_id);
-	return( p != NULL ) ? p->level : 0;
-}
-
-int read_gm_account()
-{
-	char line[8192];
-	struct gm_account *p;
-	FILE *fp;
-	int line_counter = 0, gm_counter = 0;
-	
-	ShowStatus("Starting reading gm_account\n");
-	
-	if( (fp = fopen(GM_ACCOUNT_NAME,"r")) == NULL )
-		return 1;
-	
-	gm_account_db = idb_alloc(DB_OPT_RELEASE_DATA);
-	
-	while(fgets(line,sizeof(line),fp))
-	{
-		line_counter++;
-		if ((line[0] == '/' && line[1] == '/') || line[0] == '\0' || line[0] == '\n' || line[0] == '\r')
-			continue;
-		
-		p = (struct gm_account*)aMalloc(sizeof(struct gm_account));
-		if(p==NULL){
-			ShowFatalError("gm_account: out of memory!\n");
-			exit(EXIT_FAILURE);
-		}
-		
-		if(sscanf(line,"%d %d",&p->account_id,&p->level) != 2 || p->level <= 0) {
-			ShowWarning("gm_account: unsupported data format [conf/GM_account.txt] on line %d\n", line_counter);
-			continue;
-		}
-		else {
-			if(p->level > 99)
-				p->level = 99;
-			p = (struct gm_account*)idb_put(gm_account_db,p->account_id,p);
-			if( p )
-				aFree(p);// old entry replaced
-			gm_counter++;
-			ShowInfo("GM ID: %d Level: %d\n",p->account_id,p->level);
-		}
-	}
-
-	fclose(fp);
-	ShowStatus("%d ID of gm_accounts read.\n", gm_counter);
-	return 0;
-}
-
 int convert_login(void)
 {
-	Sql* mysql_handle;
-	SqlStmt* stmt;
-	int line_counter = 0;
-	FILE *fp;
-	int account_id, logincount, user_level, state, n, i;
-	char line[2048], userid[2048], pass[2048], lastlogin[2048], sex, email[2048], error_message[2048], last_ip[2048], memo[2048];
-	int unban_time, expiration_time;
-	char dummy[2048];
+	AccountDBIterator* iter;
+	struct mmo_account acc;
 
-	mysql_handle = Sql_Malloc();
-	if ( SQL_ERROR == Sql_Connect(mysql_handle, db_server_id, db_server_pw, db_server_ip, db_server_port, db_server_logindb) )
+	if( !txtdb->init(txtdb) || !sqldb->init(sqldb) )
 	{
-		Sql_ShowDebug(mysql_handle);
-		Sql_Free(mysql_handle);
-		exit(EXIT_FAILURE);
-	}
-	ShowStatus("Connect: Success!\n");
-	
-	ShowStatus("Convert start...\n");
-	fp = fopen(ACCOUNT_TXT_NAME,"r");
-	if(fp == NULL)
+		ShowFatalError("Initialization failed, unable to start conversion.\n");
 		return 0;
+	}
 
-	while(fgets(line,sizeof(line),fp) != NULL)
-	{
-		line_counter++;
-		if(line[0]=='/' && line[1]=='/')
-			continue;
-
-		i = sscanf(line, "%d\t%[^\t]\t%[^\t]\t%[^\t]\t%c\t%d\t%d\t%[^\t]\t%[^\t]\t%d\t%[^\t]\t%[^\t]\t%d\t%[^\r\n]%n",
-			&account_id, userid, pass, lastlogin, &sex, &logincount, &state,
-			email, error_message, &expiration_time, last_ip, memo, &unban_time, dummy, &n);
+	ShowStatus("Conversion started...\n");
+	//TODO: do some counting & statistics
 
-		if (i < 13) {
-			ShowWarning("Skipping incompatible data on line %d\n", line_counter);
-			continue;
- 		}
-
-		if (i > 13)
-			ShowWarning("Reading login account variables is not implemented, data will be lost! (line %d)\n", line_counter);
-
-		user_level = isGM(account_id);
-		ShowInfo("Converting user (id: %d, name: %s, gm level: %d)\n", account_id, userid, user_level);
-		
-		stmt = SqlStmt_Malloc(mysql_handle);
-		if( SQL_ERROR == SqlStmt_Prepare(stmt, 
-			"REPLACE INTO `login` "
-			"(`account_id`, `userid`, `user_pass`, `lastlogin`, `sex`, `logincount`, `email`, `level`, `error_message`, `expiration_time`, `last_ip`, `memo`, `unban_time`, `state`) "
-			"VALUES "
-			"(%d, ?, ?, '%s', '%c', %d, '%s', %d, '%s', %d, '%s', '%s', %d, %d)",
-			account_id, lastlogin, sex, logincount, email, user_level, error_message, expiration_time, last_ip, memo, unban_time, state)
-		||	SQL_ERROR == SqlStmt_BindParam(stmt, 0, SQLDT_STRING, userid, strnlen(userid, 255))
-		||	SQL_ERROR == SqlStmt_BindParam(stmt, 1, SQLDT_STRING, pass, strnlen(pass, 32))
-		||	SQL_ERROR == SqlStmt_Execute(stmt) )
-		{
-			SqlStmt_ShowDebug(stmt);
-		}
-		SqlStmt_Free(stmt);
-	
-		//TODO: parse the rest of the line to read the login-stored account variables, and import them to `global_reg_value`
-		//      then remove the 'dummy' buffer
+	iter = txtdb->iterator(txtdb);
+	while( iter->next(iter, &acc) )
+	{
+		ShowInfo("Converting user (id: %d, name: %s, gm level: %d)...", acc.account_id, acc.userid, acc.level);
+		if( sqldb->create(sqldb, &acc) )
+			ShowMessage(CL_GREEN "success.\n");
+		else
+			ShowMessage(CL_RED "failed!\n");
 	}
-	fclose(fp);
-	Sql_Free(mysql_handle);
+	iter->destroy(iter);
 
-	ShowStatus("Convert end...\n");
+	ShowStatus("Conversion finished.\n");
 
 	return 0;
 }
@@ -162,7 +55,7 @@ int login_config_read(const char* cfgName)
 	char line[1024], w1[1024], w2[1024];
 	FILE *fp;
 
-	ShowStatus("Start reading interserver configuration: %s\n", cfgName);
+	ShowStatus("Start reading login server configuration: %s\n", cfgName);
 
 	fp=fopen(cfgName,"r");
 	if(fp==NULL){
@@ -179,56 +72,40 @@ int login_config_read(const char* cfgName)
 		if(i!=2)
 			continue;
 
-		//add for DB connection
-		if(strcmpi(w1,"db_server_ip")==0){
-			strcpy(db_server_ip, w2);
-			ShowStatus("set db_server_ip : %s\n",w2);
-		}
-		else if(strcmpi(w1,"db_server_port")==0){
-			db_server_port=atoi(w2);
-			ShowStatus("set db_server_port : %s\n",w2);
-		}
-		else if(strcmpi(w1,"db_server_id")==0){
-			strcpy(db_server_id, w2);
-			ShowStatus("set db_server_id : %s\n",w2);
-		}
-		else if(strcmpi(w1,"db_server_pw")==0){
-			strcpy(db_server_pw, w2);
-			ShowStatus("set db_server_pw : %s\n",w2);
-		}
-		else if(strcmpi(w1,"db_server_logindb")==0){
-			strcpy(db_server_logindb, w2);
-			ShowStatus("set db_server_logindb : %s\n",w2);
-		}
+		txtdb->set_property(txtdb, w1, w2);
+		sqldb->set_property(sqldb, w1, w2);
+
 		//support the import command, just like any other config
-		else if(strcmpi(w1,"import")==0){
+		if( strcmpi(w1,"import") == 0 )
 			login_config_read(w2);
-		}
 	}
+
 	fclose(fp);
-	ShowStatus("End reading interserver configuration...\n");
+	ShowStatus("End reading login server configuration...\n");
 	return 0;
 }
 
 int do_init(int argc, char** argv)
 {
 	int input;
-	login_config_read( (argc > 1) ? argv[1] : INTER_CONF_NAME );
-	read_gm_account();
+
+	txtdb = account_db_txt();
+	sqldb = account_db_sql();
+
+	login_config_read( (argc > 1) ? argv[1] : LOGIN_CONF_NAME );
 
 	ShowInfo("\nWarning : Make sure you backup your databases before continuing!\n");
 	ShowInfo("\nDo you wish to convert your Login Database to SQL? (y/n) : ");
 	input = getchar();
+
 	if(input == 'y' || input == 'Y')
 		convert_login();
+
 	return 0;
 }
 
 void do_final(void)
 {
-	if( gm_account_db )
-	{
-		db_destroy(gm_account_db);
-		gm_account_db = NULL;
-	}
+	txtdb->destroy(txtdb);
+	sqldb->destroy(sqldb);	
 }
diff --git a/src/zlib/zconf.h b/src/zlib/zconf.h
deleted file mode 100644
index 03a9431c8..000000000
--- a/src/zlib/zconf.h
+++ /dev/null
@@ -1,332 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- */
-#ifdef Z_PREFIX
-#  define deflateInit_          z_deflateInit_
-#  define deflate               z_deflate
-#  define deflateEnd            z_deflateEnd
-#  define inflateInit_          z_inflateInit_
-#  define inflate               z_inflate
-#  define inflateEnd            z_inflateEnd
-#  define deflateInit2_         z_deflateInit2_
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateCopy           z_deflateCopy
-#  define deflateReset          z_deflateReset
-#  define deflateParams         z_deflateParams
-#  define deflateBound          z_deflateBound
-#  define deflatePrime          z_deflatePrime
-#  define inflateInit2_         z_inflateInit2_
-#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateCopy           z_inflateCopy
-#  define inflateReset          z_inflateReset
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define compress              z_compress
-#  define compress2             z_compress2
-#  define compressBound         z_compressBound
-#  define uncompress            z_uncompress
-#  define adler32               z_adler32
-#  define crc32                 z_crc32
-#  define get_crc_table         z_get_crc_table
-#  define zError                z_zError
-
-#  define alloc_func            z_alloc_func
-#  define free_func             z_free_func
-#  define in_func               z_in_func
-#  define out_func              z_out_func
-#  define Byte                  z_Byte
-#  define uInt                  z_uInt
-#  define uLong                 z_uLong
-#  define Bytef                 z_Bytef
-#  define charf                 z_charf
-#  define intf                  z_intf
-#  define uIntf                 z_uIntf
-#  define uLongf                z_uLongf
-#  define voidpf                z_voidpf
-#  define voidp                 z_voidp
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-#  define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
-#endif
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#    define ZEXPORT WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA WINAPIV
-#    else
-#      define ZEXPORTVA FAR CDECL
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
-#ifndef ZEXTERN
-#  define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-
-#ifndef FAR
-#  define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
-#else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
-#endif
-
-#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */
-#  include <sys/types.h> /* for off_t */
-#  include <unistd.h>    /* for SEEK_* and off_t */
-#  ifdef VMS
-#    include <unixio.h>   /* for off_t */
-#  endif
-#  define z_off_t off_t
-#endif
-#ifndef SEEK_SET
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-#ifndef z_off_t
-#  define z_off_t long
-#endif
-
-#if defined(__OS400__)
-#  define NO_vsnprintf
-#endif
-
-#if defined(__MVS__)
-#  define NO_vsnprintf
-#  ifdef FAR
-#    undef FAR
-#  endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-#   pragma map(deflateInit_,"DEIN")
-#   pragma map(deflateInit2_,"DEIN2")
-#   pragma map(deflateEnd,"DEEND")
-#   pragma map(deflateBound,"DEBND")
-#   pragma map(inflateInit_,"ININ")
-#   pragma map(inflateInit2_,"ININ2")
-#   pragma map(inflateEnd,"INEND")
-#   pragma map(inflateSync,"INSY")
-#   pragma map(inflateSetDictionary,"INSEDI")
-#   pragma map(compressBound,"CMBND")
-#   pragma map(inflate_table,"INTABL")
-#   pragma map(inflate_fast,"INFA")
-#   pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */
diff --git a/src/zlib/zlib-1.2.3 b/src/zlib/zlib-1.2.3
deleted file mode 100644
index e69de29bb..000000000
--- a/src/zlib/zlib-1.2.3
+++ /dev/null
diff --git a/src/zlib/zlib.h b/src/zlib/zlib.h
deleted file mode 100644
index 022817927..000000000
--- a/src/zlib/zlib.h
+++ /dev/null
@@ -1,1357 +0,0 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.3, July 18th, 2005
-
-  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
-*/
-
-#ifndef ZLIB_H
-#define ZLIB_H
-
-#include "zconf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIB_VERSION "1.2.3"
-#define ZLIB_VERNUM 0x1230
-
-/*
-     The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed
-  data.  This version of the library supports only one compression method
-  (deflation) but other algorithms will be added later and will have the same
-  stream interface.
-
-     Compression can be done in a single step if the buffers are large
-  enough (for example if an input file is mmap'ed), or can be done by
-  repeated calls of the compression function.  In the latter case, the
-  application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-     The compressed data format used by default by the in-memory functions is
-  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
-  around a deflate stream, which is itself documented in RFC 1951.
-
-     The library also supports reading and writing files in gzip (.gz) format
-  with an interface similar to that of stdio using the functions that start
-  with "gz".  The gzip format is different from the zlib format.  gzip is a
-  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
-
-     This library can optionally read and write gzip streams in memory as well.
-
-     The zlib format was designed to be compact and fast for use in memory
-  and on communications channels.  The gzip format was designed for single-
-  file compression on file systems, has a larger header than zlib to maintain
-  directory information, and uses a different, slower check method than zlib.
-
-     The library does not install any signal handler. The decoder checks
-  the consistency of the compressed data, so the library should never
-  crash even in case of corrupted input.
-*/
-
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
-
-struct internal_state;
-
-typedef struct z_stream_s {
-    Bytef    *next_in;  /* next input byte */
-    uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total nb of input bytes read so far */
-
-    Bytef    *next_out; /* next output byte should be put there */
-    uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total nb of bytes output so far */
-
-    char     *msg;      /* last error message, NULL if no error */
-    struct internal_state FAR *state; /* not visible by applications */
-
-    alloc_func zalloc;  /* used to allocate the internal state */
-    free_func  zfree;   /* used to free the internal state */
-    voidpf     opaque;  /* private data object passed to zalloc and zfree */
-
-    int     data_type;  /* best guess about the data type: binary or text */
-    uLong   adler;      /* adler32 value of the uncompressed data */
-    uLong   reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream FAR *z_streamp;
-
-/*
-     gzip header information passed to and from zlib routines.  See RFC 1952
-  for more details on the meanings of these fields.
-*/
-typedef struct gz_header_s {
-    int     text;       /* true if compressed data believed to be text */
-    uLong   time;       /* modification time */
-    int     xflags;     /* extra flags (not used when writing a gzip file) */
-    int     os;         /* operating system */
-    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
-    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
-    uInt    extra_max;  /* space at extra (only when reading header) */
-    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
-    uInt    name_max;   /* space at name (only when reading header) */
-    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
-    uInt    comm_max;   /* space at comment (only when reading header) */
-    int     hcrc;       /* true if there was or will be a header crc */
-    int     done;       /* true when done reading gzip header (not used
-                           when writing a gzip file) */
-} gz_header;
-
-typedef gz_header FAR *gz_headerp;
-
-/*
-   The application must update next_in and avail_in when avail_in has
-   dropped to zero. It must update next_out and avail_out when avail_out
-   has dropped to zero. The application must initialize zalloc, zfree and
-   opaque before calling the init function. All other fields are set by the
-   compression library and must not be updated by the application.
-
-   The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree. This can be useful for custom
-   memory management. The compression library attaches no meaning to the
-   opaque value.
-
-   zalloc must return Z_NULL if there is not enough memory for the object.
-   If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
-
-   On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this
-   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
-   pointers returned by zalloc for objects of exactly 65536 bytes *must*
-   have their offset normalized to zero. The default allocation function
-   provided by this library ensures this (see zutil.c). To reduce memory
-   requirements and avoid any allocation of 64K objects, at the expense of
-   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
-
-   The fields total_in and total_out can be used for statistics or
-   progress reports. After compression, total_in holds the total size of
-   the uncompressed data and may be saved for use in the decompressor
-   (particularly if the decompressor wants to decompress everything in
-   a single step).
-*/
-
-                        /* constants */
-
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
-#define Z_SYNC_FLUSH    2
-#define Z_FULL_FLUSH    3
-#define Z_FINISH        4
-#define Z_BLOCK         5
-/* Allowed flush values; see deflate() and inflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative
- * values are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_RLE                 3
-#define Z_FIXED               4
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_TEXT     1
-#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field (though see inflate()) */
-
-#define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-                        /* basic functions */
-
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is
-   not compatible with the zlib.h header file used by the application.
-   This check is automatically made by deflateInit and inflateInit.
- */
-
-/*
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
-
-     Initializes the internal stream state for compression. The fields
-   zalloc, zfree and opaque must be initialized before by the caller.
-   If zalloc and zfree are set to Z_NULL, deflateInit updates them to
-   use default allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at
-   all (the input data is simply copied a block at a time).
-   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
-   compression (currently equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if level is not a valid compression level,
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).
-   msg is set to null if there is no error message.  deflateInit does not
-   perform any compression: this will be done by deflate().
-*/
-
-
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
-/*
-    deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce some
-  output latency (reading input without producing any output) except when
-  forced to flush.
-
-    The detailed semantics are as follows. deflate performs one or both of the
-  following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly. This action is forced if the parameter flush is non zero.
-    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).
-    Some output may be provided even if flush is not set.
-
-  Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating avail_in or avail_out accordingly; avail_out
-  should never be zero before the call. The application can consume the
-  compressed output when it wants, for example when the output buffer is full
-  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
-  and with zero avail_out, it must be called again after making room in the
-  output buffer because there might be more output pending.
-
-    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
-  decide how much data to accumualte before producing output, in order to
-  maximize compression.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-  flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far. (In particular
-  avail_in is zero after the call if enough output space has been provided
-  before the call.)  Flushing may degrade compression for some compression
-  algorithms and so it should be used only when necessary.
-
-    If flush is set to Z_FULL_FLUSH, all output is flushed as with
-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-  restart from this point if previous compressed data has been damaged or if
-  random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
-  compression.
-
-    If deflate returns with avail_out == 0, this function must be called again
-  with the same value of the flush parameter and more output space (updated
-  avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
-  avail_out is greater than six to avoid repeated flush markers due to
-  avail_out == 0 on return.
-
-    If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there
-  was enough output space; if deflate returns with Z_OK, this function must be
-  called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error. After
-  deflate has returned Z_STREAM_END, the only possible operations on the
-  stream are deflateReset or deflateEnd.
-
-    Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step. In this case, avail_out must be at least
-  the value returned by deflateBound (see below). If deflate does not return
-  Z_STREAM_END, then it must be called again as described above.
-
-    deflate() sets strm->adler to the adler32 checksum of all input read
-  so far (that is, total_in bytes).
-
-    deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered
-  binary. This field is only for information purposes and does not affect
-  the compression algorithm in any manner.
-
-    deflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if all input has been
-  consumed and all output has been produced (only when flush is set to
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
-  fatal, and deflate() can be called again with more input and more output
-  space to continue compressing.
-*/
-
-
-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded). In the error case,
-   msg may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/*
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
-
-     Initializes the internal stream state for decompression. The fields
-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
-   value depends on the compression method), inflateInit determines the
-   compression method from the zlib header and allocates all data structures
-   accordingly; otherwise the allocation will be deferred to the first call of
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-   use default allocation functions.
-
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller.  msg is set to null if there is no error
-   message. inflateInit does not perform any decompression apart from reading
-   the zlib header if present: this will be done by inflate().  (So next_in and
-   avail_in may be modified, but next_out and avail_out are unchanged.)
-*/
-
-
-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
-/*
-    inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-  The detailed semantics are as follows. inflate performs one or both of the
-  following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing
-    will resume at this point for the next call of inflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there
-    is no more input data or no more space in the output buffer (see below
-    about the flush parameter).
-
-  Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating the next_* and avail_* values accordingly.
-  The application can consume the uncompressed output when it wants, for
-  example when the output buffer is full (avail_out == 0), or after each
-  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
-  must be called again after making room in the output buffer because there
-  might be more output pending.
-
-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,
-  Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much
-  output as possible to the output buffer. Z_BLOCK requests that inflate() stop
-  if and when it gets to the next deflate block boundary. When decoding the
-  zlib or gzip format, this will cause inflate() to return immediately after
-  the header and before the first block. When doing a raw inflate, inflate()
-  will go ahead and process the first block, and will return when it gets to
-  the end of that block, or when it runs out of data.
-
-    The Z_BLOCK option assists in appending to or combining deflate streams.
-  Also to assist in this, on return inflate() will set strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64
-  if inflate() is currently decoding the last block in the deflate stream,
-  plus 128 if inflate() returned immediately after decoding an end-of-block
-  code or decoding the complete header up to just before the first byte of the
-  deflate stream. The end-of-block will not be indicated until all of the
-  uncompressed data from that block has been written to strm->next_out.  The
-  number of unused bits may in general be greater than seven, except when
-  bit 7 of data_type is set, in which case the number of unused bits will be
-  less than eight.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error. However if all decompression is to be performed in a single step
-  (a single call of inflate), the parameter flush should be set to
-  Z_FINISH. In this case all pending input is processed and all pending
-  output is flushed; avail_out must be large enough to hold all the
-  uncompressed data. (The size of the uncompressed data may have been saved
-  by the compressor for this purpose.) The next operation on this stream must
-  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
-  is never required, but can be used to inform inflate that a faster approach
-  may be used for the single inflate() call.
-
-     In this implementation, inflate() always flushes as much output as
-  possible to the output buffer, and always uses the faster approach on the
-  first call. So the only effect of the flush parameter in this implementation
-  is on the return value of inflate(), as noted below, or when it returns early
-  because Z_BLOCK is used.
-
-     If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the adler32 checksum of the dictionary
-  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the adler32 checksum of all output produced so far (that is,
-  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below. At the end of the stream, inflate() checks that its computed adler32
-  checksum is equal to that saved by the compressor and returns Z_STREAM_END
-  only if the checksum is correct.
-
-    inflate() will decompress and check either zlib-wrapped or gzip-wrapped
-  deflate data.  The header type is detected automatically.  Any information
-  contained in the gzip header is not retained, so applications that need that
-  information should instead use raw inflate, see inflateInit2() below, or
-  inflateBack() and perform their own processing of the gzip header and
-  trailer.
-
-    inflate() returns Z_OK if some progress has been made (more input processed
-  or more output produced), Z_STREAM_END if the end of the compressed data has
-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-  corrupted (input stream not conforming to the zlib format or incorrect check
-  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
-  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-  output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
-  inflate() can be called again with more input and more output space to
-  continue decompressing. If Z_DATA_ERROR is returned, the application may then
-  call inflateSync() to look for a good compression block if a partial recovery
-  of the data is desired.
-*/
-
-
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent. In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
-*/
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy));
-
-     This is another version of deflateInit with more compression options. The
-   fields next_in, zalloc, zfree and opaque must be initialized before by
-   the caller.
-
-     The method parameter is the compression method. It must be Z_DEFLATED in
-   this version of the library.
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer). It should be in the range 8..15 for this
-   version of the library. Larger values of this parameter result in better
-   compression at the expense of memory usage. The default value is 15 if
-   deflateInit is used instead.
-
-     windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
-   determines the window size. deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute an adler32 check value.
-
-     windowBits can also be greater than 15 for optional gzip encoding. Add
-   16 to windowBits to write a simple gzip header and trailer around the
-   compressed data instead of a zlib wrapper. The gzip header will have no
-   file name, no extra data, no comment, no modification time (set to zero),
-   no header crc, and the operating system will be set to 255 (unknown).  If a
-   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state. memLevel=1 uses minimum memory but
-   is slow and reduces compression ratio; memLevel=9 uses maximum memory
-   for optimal speed. The default value is 8. See zconf.h for total memory
-   usage as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm. Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match), or Z_RLE to limit match distances to one (run-length
-   encoding). Filtered data consists mostly of small values with a somewhat
-   random distribution. In this case, the compression algorithm is tuned to
-   compress them better. The effect of Z_FILTERED is to force more Huffman
-   coding and less string matching; it is somewhat intermediate between
-   Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as
-   Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy
-   parameter only affects the compression ratio but not the correctness of the
-   compressed output even if it is not set appropriately.  Z_FIXED prevents the
-   use of dynamic Huffman codes, allowing for a simpler decoder for special
-   applications.
-
-      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
-   method). msg is set to null if there is no error message.  deflateInit2 does
-   not perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output. This function must be called
-   immediately after deflateInit, deflateInit2 or deflateReset, before any
-   call of deflate. The compressor and decompressor must use exactly the same
-   dictionary (see inflateSetDictionary).
-
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary. Using a
-   dictionary is most useful when the data to be compressed is short and can be
-   predicted with good accuracy; the data can then be compressed better than
-   with the default empty dictionary.
-
-     Depending on the size of the compression data structures selected by
-   deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size in
-   deflate or deflate2. Thus the strings most likely to be useful should be
-   put at the end of the dictionary, not at the front. In addition, the
-   current implementation of deflate will use at most the window size minus
-   262 bytes of the provided dictionary.
-
-     Upon return of this function, strm->adler is set to the adler32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor. (The adler32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.) If a raw deflate was requested, then the
-   adler32 value is not computed and strm->adler is not set.
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent (for example if deflate has already been called for this stream
-   or if the compression method is bsort). deflateSetDictionary does not
-   perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter. The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and
-   can consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.
-   The stream will keep the same compression level and any other attributes
-   that may have been set by deflateInit2.
-
-      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-                                      int level,
-                                      int strategy));
-/*
-     Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
-   used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different
-   strategy. If the compression level is changed, the input available so far
-   is compressed with the old level (and may be flushed); the new level will
-   take effect only at the next call of deflate().
-
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to
-   be compressed and flushed. In particular, strm->avail_out must be non-zero.
-
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
-   if strm->avail_out was zero.
-*/
-
-ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
-                                    int good_length,
-                                    int max_lazy,
-                                    int nice_length,
-                                    int max_chain));
-/*
-     Fine tune deflate's internal compression parameters.  This should only be
-   used by someone who understands the algorithm used by zlib's deflate for
-   searching for the best matching string, and even then only by the most
-   fanatic optimizer trying to squeeze out the last compressed bit for their
-   specific input data.  Read the deflate.c source code for the meaning of the
-   max_lazy, good_length, nice_length, and max_chain parameters.
-
-     deflateTune() can be called after deflateInit() or deflateInit2(), and
-   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
- */
-
-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
-                                       uLong sourceLen));
-/*
-     deflateBound() returns an upper bound on the compressed size after
-   deflation of sourceLen bytes.  It must be called after deflateInit()
-   or deflateInit2().  This would be used to allocate an output buffer
-   for deflation in a single pass, and so would be called before deflate().
-*/
-
-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     deflatePrime() inserts bits in the deflate output stream.  The intent
-  is that this function is used to start off the deflate output with the
-  bits leftover from a previous deflate stream when appending to it.  As such,
-  this function can only be used for raw deflate, and must be used before the
-  first deflate() call after a deflateInit2() or deflateReset().  bits must be
-  less than or equal to 16, and that many of the least significant bits of
-  value will be inserted in the output.
-
-      deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-      deflateSetHeader() provides gzip header information for when a gzip
-   stream is requested by deflateInit2().  deflateSetHeader() may be called
-   after deflateInit2() or deflateReset() and before the first call of
-   deflate().  The text, time, os, extra field, name, and comment information
-   in the provided gz_header structure are written to the gzip header (xflag is
-   ignored -- the extra flags are set according to the compression level).  The
-   caller must assure that, if not Z_NULL, name and comment are terminated with
-   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
-   available there.  If hcrc is true, a gzip header crc is included.  Note that
-   the current versions of the command-line version of gzip (up through version
-   1.3.x) do not support header crc's, and will report that it is a "multi-part
-   gzip file" and give up.
-
-      If deflateSetHeader is not used, the default gzip header has text false,
-   the time set to zero, and os set to 255, with no extra, name, or comment
-   fields.  The gzip header is returned to the default state by deflateReset().
-
-      deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-                                     int  windowBits));
-
-     This is another version of inflateInit with an extra parameter. The
-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-   before by the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library. The default value is 15 if inflateInit is used
-   instead. windowBits must be greater than or equal to the windowBits value
-   provided to deflateInit2() while compressing, or it must be equal to 15 if
-   deflateInit2() was not used. If a compressed stream with a larger window
-   size is given as input, inflate() will return with the error code
-   Z_DATA_ERROR instead of trying to allocate a larger window.
-
-     windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
-   determines the window size. inflate() will then process raw deflate data,
-   not looking for a zlib or gzip header, not generating a check value, and not
-   looking for any check values for comparison at the end of the stream. This
-   is for use with other formats that use the deflate compressed data format
-   such as zip.  Those formats provide their own check values. If a custom
-   format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an adler32 or a crc32 be applied to
-   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
-   most applications, the zlib format should be used as is. Note that comments
-   above on the use in deflateInit2() applies to the magnitude of windowBits.
-
-     windowBits can also be greater than 15 for optional gzip decoding. Add
-   32 to windowBits to enable zlib and gzip decoding with automatic header
-   detection, or add 16 to decode only the gzip format (the zlib format will
-   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is
-   a crc32 instead of an adler32.
-
-     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg
-   is set to null if there is no error message.  inflateInit2 does not perform
-   any decompression apart from reading the zlib header if present: this will
-   be done by inflate(). (So next_in and avail_in may be modified, but next_out
-   and avail_out are unchanged.)
-*/
-
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the decompression dictionary from the given uncompressed byte
-   sequence. This function must be called immediately after a call of inflate,
-   if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
-   can be determined from the adler32 value returned by that call of inflate.
-   The compressor and decompressor must use exactly the same dictionary (see
-   deflateSetDictionary).  For raw inflate, this function can be called
-   immediately after inflateInit2() or inflateReset() and before any call of
-   inflate() to set the dictionary.  The application must insure that the
-   dictionary that was used for compression is provided.
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect adler32 value). inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
-/*
-    Skips invalid compressed data until a full flush point (see above the
-  description of deflate with Z_FULL_FLUSH) can be found, or until all
-  available input is skipped. No output is provided.
-
-    inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
-  if no more input was provided, Z_DATA_ERROR if no flush point has been found,
-  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
-  case, the application may save the current current value of total_in which
-  indicates where valid compressed data was found. In the error case, the
-  application may repeatedly call inflateSync, providing more input each time,
-  until success or end of the input data.
-*/
-
-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when randomly accessing a large stream.  The
-   first pass through the stream can periodically record the inflate state,
-   allowing restarting inflate at those points when randomly accessing the
-   stream.
-
-     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.
-   The stream will keep attributes that may have been set by inflateInit2.
-
-      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     This function inserts bits in the inflate input stream.  The intent is
-  that this function is used to start inflating at a bit position in the
-  middle of a byte.  The provided bits will be used before any bytes are used
-  from next_in.  This function should only be used with raw inflate, and
-  should be used before the first inflate() call after inflateInit2() or
-  inflateReset().  bits must be less than or equal to 16, and that many of the
-  least significant bits of value will be inserted in the input.
-
-      inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-      inflateGetHeader() requests that gzip header information be stored in the
-   provided gz_header structure.  inflateGetHeader() may be called after
-   inflateInit2() or inflateReset(), and before the first call of inflate().
-   As inflate() processes the gzip stream, head->done is zero until the header
-   is completed, at which time head->done is set to one.  If a zlib stream is
-   being decoded, then head->done is set to -1 to indicate that there will be
-   no gzip header information forthcoming.  Note that Z_BLOCK can be used to
-   force inflate() to return immediately after header processing is complete
-   and before any actual data is decompressed.
-
-      The text, time, xflags, and os fields are filled in with the gzip header
-   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
-   was valid if done is set to one.)  If extra is not Z_NULL, then extra_max
-   contains the maximum number of bytes to write to extra.  Once done is true,
-   extra_len contains the actual extra field length, and extra contains the
-   extra field, or that field truncated if extra_max is less than extra_len.
-   If name is not Z_NULL, then up to name_max characters are written there,
-   terminated with a zero unless the length is greater than name_max.  If
-   comment is not Z_NULL, then up to comm_max characters are written there,
-   terminated with a zero unless the length is greater than comm_max.  When
-   any of extra, name, or comment are not Z_NULL and the respective field is
-   not present in the header, then that field is set to Z_NULL to signal its
-   absence.  This allows the use of deflateSetHeader() with the returned
-   structure to duplicate the header.  However if those fields are set to
-   allocated memory, then the application will need to save those pointers
-   elsewhere so that they can be eventually freed.
-
-      If inflateGetHeader is not used, then the header information is simply
-   discarded.  The header is always checked for validity, including the header
-   CRC if present.  inflateReset() will reset the process to discard the header
-   information.  The application would need to call inflateGetHeader() again to
-   retrieve the header from the next gzip stream.
-
-      inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
-                                        unsigned char FAR *window));
-
-     Initialize the internal stream state for decompression using inflateBack()
-   calls.  The fields zalloc, zfree and opaque in strm must be initialized
-   before the call.  If zalloc and zfree are Z_NULL, then the default library-
-   derived memory allocation routines are used.  windowBits is the base two
-   logarithm of the window size, in the range 8..15.  window is a caller
-   supplied buffer of that size.  Except for special applications where it is
-   assured that deflate was used with small window sizes, windowBits must be 15
-   and a 32K byte window must be supplied to be able to decompress general
-   deflate streams.
-
-     See inflateBack() for the usage of these routines.
-
-     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the paramaters are invalid, Z_MEM_ERROR if the internal state could not
-   be allocated, or Z_VERSION_ERROR if the version of the library does not
-   match the version of the header file.
-*/
-
-typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
-typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
-
-ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
-                                    in_func in, void FAR *in_desc,
-                                    out_func out, void FAR *out_desc));
-/*
-     inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is more efficient than inflate() for
-   file i/o applications in that it avoids copying between the output and the
-   sliding window by simply making the window itself the output buffer.  This
-   function trusts the application to not change the output buffer passed by
-   the output function, at least until inflateBack() returns.
-
-     inflateBackInit() must be called first to allocate the internal state
-   and to initialize the state with the user-provided window buffer.
-   inflateBack() may then be used multiple times to inflate a complete, raw
-   deflate stream with each call.  inflateBackEnd() is then called to free
-   the allocated state.
-
-     A raw deflate stream is one with no zlib or gzip header or trailer.
-   This routine would normally be used in a utility that reads zip or gzip
-   files and writes out uncompressed files.  The utility would decode the
-   header and process the trailer on its own, hence this routine expects
-   only the raw deflate stream to decompress.  This is different from the
-   normal behavior of inflate(), which expects either a zlib or gzip header and
-   trailer around the deflate stream.
-
-     inflateBack() uses two subroutines supplied by the caller that are then
-   called by inflateBack() for input and output.  inflateBack() calls those
-   routines until it reads a complete deflate stream and writes out all of the
-   uncompressed data, or until it encounters an error.  The function's
-   parameters and return types are defined above in the in_func and out_func
-   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
-   number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero--buf is ignored in that
-   case--and inflateBack() will return a buffer error.  inflateBack() will call
-   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
-   should return zero on success, or non-zero on failure.  If out() returns
-   non-zero, inflateBack() will return with an error.  Neither in() nor out()
-   are permitted to change the contents of the window provided to
-   inflateBackInit(), which is also the buffer that out() uses to write from.
-   The length written by out() will be at most the window size.  Any non-zero
-   amount of input may be provided by in().
-
-     For convenience, inflateBack() can be provided input on the first call by
-   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
-   in() will be called.  Therefore strm->next_in must be initialized before
-   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
-   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
-   must also be initialized, and then if strm->avail_in is not zero, input will
-   initially be taken from strm->next_in[0 .. strm->avail_in - 1].
-
-     The in_desc and out_desc parameters of inflateBack() is passed as the
-   first parameter of in() and out() respectively when they are called.  These
-   descriptors can be optionally used to pass any information that the caller-
-   supplied in() and out() functions need to do their job.
-
-     On return, inflateBack() will set strm->next_in and strm->avail_in to
-   pass back any unused input that was provided by the last in() call.  The
-   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
-   if in() or out() returned an error, Z_DATA_ERROR if there was a format
-   error in the deflate stream (in which case strm->msg is set to indicate the
-   nature of the error), or Z_STREAM_ERROR if the stream was not properly
-   initialized.  In the case of Z_BUF_ERROR, an input or output error can be
-   distinguished using strm->next_in which will be Z_NULL only if in() returned
-   an error.  If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to
-   out() returning non-zero.  (in() will always be called before out(), so
-   strm->next_in is assured to be defined if out() returns non-zero.)  Note
-   that inflateBack() cannot return Z_OK.
-*/
-
-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
-/*
-     All memory allocated by inflateBackInit() is freed.
-
-     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
-   state was inconsistent.
-*/
-
-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
-/* Return flags indicating compile-time options.
-
-    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
-     1.0: size of uInt
-     3.2: size of uLong
-     5.4: size of voidpf (pointer)
-     7.6: size of z_off_t
-
-    Compiler, assembler, and debug options:
-     8: DEBUG
-     9: ASMV or ASMINF -- use ASM code
-     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
-     11: 0 (reserved)
-
-    One-time table building (smaller code, but not thread-safe if true):
-     12: BUILDFIXED -- build static block decoding tables when needed
-     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
-     14,15: 0 (reserved)
-
-    Library content (indicates missing functionality):
-     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
-                          deflate code when not needed)
-     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
-                    and decode gzip streams (to avoid linking crc code)
-     18-19: 0 (reserved)
-
-    Operation variations (changes in library functionality):
-     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
-     21: FASTEST -- deflate algorithm with only one, lowest compression level
-     22,23: 0 (reserved)
-
-    The sprintf variant used by gzprintf (zero is best):
-     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
-     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
-     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
-
-    Remainder:
-     27-31: 0 (reserved)
- */
-
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the
-   basic stream-oriented functions. To simplify the interface, some
-   default options are assumed (compression level and memory usage,
-   standard memory allocation functions). The source code of these
-   utility functions can easily be modified if you need special options.
-*/
-
-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-                                 const Bytef *source, uLong sourceLen));
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be at least the value returned
-   by compressBound(sourceLen). Upon exit, destLen is the actual size of the
-   compressed buffer.
-     This function can be used to compress a whole file at once if the
-   input file is mmap'ed.
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-
-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
-                                  const Bytef *source, uLong sourceLen,
-                                  int level));
-/*
-     Compresses the source buffer into the destination buffer. The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer. Upon entry, destLen is the total size of the
-   destination buffer, which must be at least the value returned by
-   compressBound(sourceLen). Upon exit, destLen is the actual size of the
-   compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-
-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
-/*
-     compressBound() returns an upper bound on the compressed size after
-   compress() or compress2() on sourceLen bytes.  It would be used before
-   a compress() or compress2() call to allocate the destination buffer.
-*/
-
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-                                   const Bytef *source, uLong sourceLen));
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be large enough to hold the
-   entire uncompressed data. (The size of the uncompressed data must have
-   been saved previously by the compressor and transmitted to the decompressor
-   by some mechanism outside the scope of this compression library.)
-   Upon exit, destLen is the actual size of the compressed buffer.
-     This function can be used to decompress a whole file at once if the
-   input file is mmap'ed.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
-*/
-
-
-typedef voidp gzFile;
-
-ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));
-/*
-     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb") but can also include a compression level
-   ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
-   Huffman only compression as in "wb1h", or 'R' for run-length encoding
-   as in "wb1R". (See the description of deflateInit2 for more information
-   about the strategy parameter.)
-
-     gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.
-
-     gzopen returns NULL if the file could not be opened or if there was
-   insufficient memory to allocate the (de)compression state; errno
-   can be checked to distinguish the two cases (if errno is zero, the
-   zlib error is Z_MEM_ERROR).  */
-
-ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));
-/*
-     gzdopen() associates a gzFile with the file descriptor fd.  File
-   descriptors are obtained from calls like open, dup, creat, pipe or
-   fileno (in the file has been previously opened with fopen).
-   The mode parameter is as in gzopen.
-     The next call of gzclose on the returned gzFile will also close the
-   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
-   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
-     gzdopen returns NULL if there was insufficient memory to allocate
-   the (de)compression state.
-*/
-
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
-/*
-     Dynamically update the compression level or strategy. See the description
-   of deflateInit2 for the meaning of these parameters.
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-   opened for writing.
-*/
-
-ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
-/*
-     Reads the given number of uncompressed bytes from the compressed file.
-   If the input file was not in gzip format, gzread copies the given number
-   of bytes into the buffer.
-     gzread returns the number of uncompressed bytes actually read (0 for
-   end of file, -1 for error). */
-
-ZEXTERN int ZEXPORT    gzwrite OF((gzFile file,
-                                   voidpc buf, unsigned len));
-/*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes actually written
-   (0 in case of error).
-*/
-
-ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
-/*
-     Converts, formats, and writes the args to the compressed file under
-   control of the format string, as in fprintf. gzprintf returns the number of
-   uncompressed bytes actually written (0 in case of error).  The number of
-   uncompressed bytes written is limited to 4095. The caller should assure that
-   this limit is not exceeded. If it is exceeded, then gzprintf() will return
-   return an error (0) with nothing written. In this case, there may also be a
-   buffer overflow with unpredictable consequences, which is possible only if
-   zlib was compiled with the insecure functions sprintf() or vsprintf()
-   because the secure snprintf() or vsnprintf() functions were not available.
-*/
-
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
-/*
-      Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-      gzputs returns the number of characters written, or -1 in case of error.
-*/
-
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
-/*
-      Reads bytes from the compressed file until len-1 characters are read, or
-   a newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  The string is then terminated with a null
-   character.
-      gzgets returns buf, or Z_NULL in case of error.
-*/
-
-ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));
-/*
-      Writes c, converted to an unsigned char, into the compressed file.
-   gzputc returns the value that was written, or -1 in case of error.
-*/
-
-ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));
-/*
-      Reads one byte from the compressed file. gzgetc returns this byte
-   or -1 in case of end of file or error.
-*/
-
-ZEXTERN int ZEXPORT    gzungetc OF((int c, gzFile file));
-/*
-      Push one character back onto the stream to be read again later.
-   Only one character of push-back is allowed.  gzungetc() returns the
-   character pushed, or -1 on failure.  gzungetc() will fail if a
-   character has been pushed but not read yet, or if c is -1. The pushed
-   character will be discarded if the stream is repositioned with gzseek()
-   or gzrewind().
-*/
-
-ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));
-/*
-     Flushes all pending output into the compressed file. The parameter
-   flush is as in the deflate() function. The return value is the zlib
-   error number (see function gzerror below). gzflush returns Z_OK if
-   the flush parameter is Z_FINISH and all output could be flushed.
-     gzflush should be called only when strictly necessary because it can
-   degrade compression.
-*/
-
-ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
-                                      z_off_t offset, int whence));
-/*
-      Sets the starting position for the next gzread or gzwrite on the
-   given compressed file. The offset represents a number of bytes in the
-   uncompressed data stream. The whence parameter is defined as in lseek(2);
-   the value SEEK_END is not supported.
-     If the file is opened for reading, this function is emulated but can be
-   extremely slow. If the file is opened for writing, only forward seeks are
-   supported; gzseek then compresses a sequence of zeroes up to the new
-   starting position.
-
-      gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error, in
-   particular if the file is opened for writing and the new starting position
-   would be before the current position.
-*/
-
-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
-/*
-     Rewinds the given file. This function is supported only for reading.
-
-   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-*/
-
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
-/*
-     Returns the starting position for the next gzread or gzwrite on the
-   given compressed file. This position represents a number of bytes in the
-   uncompressed data stream.
-
-   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-ZEXTERN int ZEXPORT gzeof OF((gzFile file));
-/*
-     Returns 1 when EOF has previously been detected reading the given
-   input stream, otherwise zero.
-*/
-
-ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
-/*
-     Returns 1 if file is being read directly without decompression, otherwise
-   zero.
-*/
-
-ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
-/*
-     Flushes all pending output if necessary, closes the compressed file
-   and deallocates all the (de)compression state. The return value is the zlib
-   error number (see function gzerror below).
-*/
-
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
-/*
-     Returns the error message for the last error which occurred on the
-   given compressed file. errnum is set to zlib error number. If an
-   error occurred in the file system and not in the compression library,
-   errnum is set to Z_ERRNO and the application may consult errno
-   to get the exact error code.
-*/
-
-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
-/*
-     Clears the error and end-of-file flags for file. This is analogous to the
-   clearerr() function in stdio. This is useful for continuing to read a gzip
-   file that is being written concurrently.
-*/
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the
-   compression library.
-*/
-
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-/*
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum. If buf is NULL, this function returns
-   the required initial value for the checksum.
-   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-   much faster. Usage example:
-
-     uLong adler = adler32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
-                                          z_off_t len2));
-/*
-     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
-   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
-   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.
-*/
-
-ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
-/*
-     Update a running CRC-32 with the bytes buf[0..len-1] and return the
-   updated CRC-32. If buf is NULL, this function returns the required initial
-   value for the for the crc. Pre- and post-conditioning (one's complement) is
-   performed within this function so it shouldn't be done by the application.
-   Usage example:
-
-     uLong crc = crc32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       crc = crc32(crc, buffer, length);
-     }
-     if (crc != original_crc) error();
-*/
-
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
-
-/*
-     Combine two CRC-32 check values into one.  For two sequences of bytes,
-   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
-   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
-   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
-   len2.
-*/
-
-
-                        /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                                      int windowBits, int memLevel,
-                                      int strategy, const char *version,
-                                      int stream_size));
-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
-                                         unsigned char FAR *window,
-                                         const char *version,
-                                         int stream_size));
-#define deflateInit(strm, level) \
-        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
-#define inflateBackInit(strm, windowBits, window) \
-        inflateBackInit_((strm), (windowBits), (window), \
-        ZLIB_VERSION, sizeof(z_stream))
-
-
-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;}; /* hack for buggy compilers */
-#endif
-
-ZEXTERN const char   * ZEXPORT zError           OF((int));
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
-ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZLIB_H */