ソースを参照

* Removed ladmin (remote administration tool), all related support code and the checkversion.pl tool with it's support code, which was shared with ladmin (topic:262934, related bugreport:1147, bugreport:1889, r9408 and r9610).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14667 54d463be-8e91-2dee-dedb-b68131a5f0ec
ai4rei 14 年 前
コミット
3e4934d780

+ 1 - 0
Changelog-Trunk.txt

@@ -1,6 +1,7 @@
 Date	Added
 Date	Added
 
 
 2011/01/13
 2011/01/13
+	* Removed ladmin (remote administration tool), all related support code and the checkversion.pl tool with it's support code, which was shared with ladmin (topic:262934, related bugreport:1147, bugreport:1889, r9408 and r9610). [Ai4rei]
 	* Fixed chrif-packet processing considering free/unused packet IDs incorrectly as variable length packets (-1 = variable length, 0 = disabled packet). [Ai4rei]
 	* Fixed chrif-packet processing considering free/unused packet IDs incorrectly as variable length packets (-1 = variable length, 0 = disabled packet). [Ai4rei]
 	* Added support for creating account through the console-plugin on login-server (replaces ladmin functionality unavailable through atcommands). [Ai4rei]
 	* Added support for creating account through the console-plugin on login-server (replaces ladmin functionality unavailable through atcommands). [Ai4rei]
 	* Reformatting and minor cleanups to console-plugin related code. [Ai4rei]
 	* Reformatting and minor cleanups to console-plugin related code. [Ai4rei]

+ 3 - 10
Makefile.in

@@ -2,7 +2,7 @@
 
 
 HAVE_MYSQL=@HAVE_MYSQL@
 HAVE_MYSQL=@HAVE_MYSQL@
 ifeq ($(HAVE_MYSQL),yes)
 ifeq ($(HAVE_MYSQL),yes)
-	ALL_DEPENDS=common common_sql login login_sql char char_sql map map_sql ladmin tools converters plugins import save
+	ALL_DEPENDS=common common_sql login login_sql char char_sql map map_sql tools converters plugins import save
 	SQL_DEPENDS=common_sql login_sql char_sql map_sql import save
 	SQL_DEPENDS=common_sql login_sql char_sql map_sql import save
 	COMMON_SQL_DEPENDS=
 	COMMON_SQL_DEPENDS=
 	LOGIN_SQL_DEPENDS=common_sql
 	LOGIN_SQL_DEPENDS=common_sql
@@ -10,7 +10,7 @@ ifeq ($(HAVE_MYSQL),yes)
 	MAP_SQL_DEPENDS=common_sql
 	MAP_SQL_DEPENDS=common_sql
 	CONVERTERS_DEPENDS=common_sql
 	CONVERTERS_DEPENDS=common_sql
 else
 else
-	ALL_DEPENDS=common login char map ladmin tools plugins import save
+	ALL_DEPENDS=common login char map tools plugins import save
 	SQL_DEPENDS=needs_mysql
 	SQL_DEPENDS=needs_mysql
 	COMMON_SQL_DEPENDS=needs_mysql
 	COMMON_SQL_DEPENDS=needs_mysql
 	LOGIN_SQL_DEPENDS=needs_mysql
 	LOGIN_SQL_DEPENDS=needs_mysql
@@ -25,7 +25,7 @@ endif
 	login login_sql \
 	login login_sql \
 	char char_sql \
 	char char_sql \
 	map map_sql \
 	map map_sql \
-	ladmin tools converters plugins addons import save \
+	tools converters plugins addons import save \
 	clean help
 	clean help
 
 
 all: $(ALL_DEPENDS)
 all: $(ALL_DEPENDS)
@@ -60,9 +60,6 @@ map: common
 map_sql: $(MAP_SQL_DEPENDS)
 map_sql: $(MAP_SQL_DEPENDS)
 	@$(MAKE) -C src/map sql
 	@$(MAKE) -C src/map sql
 
 
-ladmin: common
-	@$(MAKE) -C src/ladmin
-
 tools:
 tools:
 	@$(MAKE) -C src/tool
 	@$(MAKE) -C src/tool
 
 
@@ -96,7 +93,6 @@ clean:
 	@$(MAKE) -C src/char $@
 	@$(MAKE) -C src/char $@
 	@$(MAKE) -C src/char_sql $@
 	@$(MAKE) -C src/char_sql $@
 	@$(MAKE) -C src/map $@
 	@$(MAKE) -C src/map $@
-	@$(MAKE) -C src/ladmin $@
 	@$(MAKE) -C src/plugins $@
 	@$(MAKE) -C src/plugins $@
 	@$(MAKE) -C src/tool $@
 	@$(MAKE) -C src/tool $@
 	@$(MAKE) -C src/txt-converter $@
 	@$(MAKE) -C src/txt-converter $@
@@ -112,7 +108,6 @@ help:
 	@echo "'char_sql'    - builds char server (SQL version)"
 	@echo "'char_sql'    - builds char server (SQL version)"
 	@echo "'map'         - builds map server (TXT version)"
 	@echo "'map'         - builds map server (TXT version)"
 	@echo "'map_sql'     - builds map server (SQL version)"
 	@echo "'map_sql'     - builds map server (SQL version)"
-	@echo "'ladmin'      - builds remote administration tool"
 	@echo "'tools'       - builds all the tools in src/tools"
 	@echo "'tools'       - builds all the tools in src/tools"
 	@echo "'converters'  - builds the login/char converters"
 	@echo "'converters'  - builds the login/char converters"
 	@echo "'plugins'     - builds all the plugins in src/plugins"
 	@echo "'plugins'     - builds all the plugins in src/plugins"
@@ -148,7 +143,6 @@ install:	conf/%.conf conf/%.txt
 	$(shell mv npc /opt/eathena/etc/eathena/npc)
 	$(shell mv npc /opt/eathena/etc/eathena/npc)
 	$(shell mv log/* /opt/eathena/var/log/eathena/)
 	$(shell mv log/* /opt/eathena/var/log/eathena/)
 	$(shell cp *-server* /opt/eathena/bin/)
 	$(shell cp *-server* /opt/eathena/bin/)
-	$(shell cp ladmin /opt/eathena/bin/)
 	$(shell ln -s /opt/eathena/etc/eathena/save/ /opt/eathena/bin/)
 	$(shell ln -s /opt/eathena/etc/eathena/save/ /opt/eathena/bin/)
 	$(shell ln -s /opt/eathena/etc/eathena/db/ /opt/eathena/bin/)
 	$(shell ln -s /opt/eathena/etc/eathena/db/ /opt/eathena/bin/)
 	$(shell ln -s /opt/eathena/etc/eathena/conf/ /opt/eathena/bin/)
 	$(shell ln -s /opt/eathena/etc/eathena/conf/ /opt/eathena/bin/)
@@ -159,7 +153,6 @@ bin-clean:
 	$(shell rm /opt/eathena/bin/login-server*)
 	$(shell rm /opt/eathena/bin/login-server*)
 	$(shell rm /opt/eathena/bin/char-server*)
 	$(shell rm /opt/eathena/bin/char-server*)
 	$(shell rm /opt/eathena/bin/map-server*)
 	$(shell rm /opt/eathena/bin/map-server*)
-	$(shell rm /opt/eathena/bin/ladmin)
 
 
 uninstall:
 uninstall:
 	$(shell read -p "WARNING: This target does not work properly yet. Press Ctrl+C to cancel or Enter to continue.")
 	$(shell read -p "WARNING: This target does not work properly yet. Press Ctrl+C to cancel or Enter to continue.")

+ 2 - 0
conf/Changelog.txt

@@ -1,5 +1,7 @@
 Date	Added
 Date	Added
 
 
+2011/01/13
+	* Rev. 14667 Removed ladmin settings (ladmin_athena.conf) and login-server settings for ladmin (login_athena.conf) (topic:262934). [Ai4rei]
 2010/12/30
 2010/12/30
 	* Rev. 14643 Updated mapcache up to 2010-12-01. Adds Bifrost, Dewata and Malangdo maps. [Ai4rei]
 	* Rev. 14643 Updated mapcache up to 2010-12-01. Adds Bifrost, Dewata and Malangdo maps. [Ai4rei]
 2010/12/12
 2010/12/12

+ 0 - 0
conf/import-tmpl/ladmin_conf.txt


+ 0 - 31
conf/ladmin_athena.conf

@@ -1,31 +0,0 @@
-// Athena Ladmin configuration file.
- 
-// Login Server IP
-login_ip:127.0.0.1
-// Login Server Port
-login_port: 6900
-
-// Administrative password, used to connect remotely to server.
-// NOTICE: If you enable remote administration, you should change its value for security
-admin_pass: admin
-
-// Encoding type of the password
-// 0: not encoded
-// 1: key+password
-// 2: password+key
-passenc: 2
-
-// Log Filename. All operations done by the software are logged in this file.
-ladmin_log_filename: log/ladmin.log
-
-// Indicate how to display date in logs, to players, etc.
-// 0: 31-12-2004 23:59:59
-// 1: 12-31-2004 23:59:59
-// 2: 2004-31-12 23:59:59
-// 3: 2004-12-31 23:59:59 (default)
-date_format: 3
-
-//If redirected output contains escape sequences (color codes)
-stdout_with_ansisequence: no
-
-import: conf/import/ladmin_conf.txt

+ 0 - 10
conf/login_athena.conf

@@ -35,16 +35,6 @@ stdout_with_ansisequence: no
 //Example: "console_silent: 7" Hides information, status and notice messages (1+2+4)
 //Example: "console_silent: 7" Hides information, status and notice messages (1+2+4)
 console_silent: 0
 console_silent: 0
 
 
-// Whether remote administration is enabled or disabled
-admin_state: no
-
-// Administrative password, used by ladmin to connect remotely to server.
-// NOTICE: you should change this value for security if you use ladmin.
-admin_pass: admin
-
-// Indicate the IP/host that the server accepts for remote administration.
-admin_allowed_host: 127.0.0.1
-
 // Console Commands
 // Console Commands
 // Allow for console commands to be used on/off
 // Allow for console commands to be used on/off
 // This prevents usage of >& log.file
 // This prevents usage of >& log.file

+ 1 - 2
configure

@@ -1333,7 +1333,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
                     ac_config_files="$ac_config_files Makefile src/common/Makefile"
                     ac_config_files="$ac_config_files Makefile src/common/Makefile"
 
 
-                              ac_config_files="$ac_config_files src/char/Makefile src/login/Makefile src/ladmin/Makefile"
+                              ac_config_files="$ac_config_files src/char/Makefile src/login/Makefile"
 
 
                     ac_config_files="$ac_config_files src/char_sql/Makefile src/txt-converter/Makefile"
                     ac_config_files="$ac_config_files src/char_sql/Makefile src/txt-converter/Makefile"
 
 
@@ -5628,7 +5628,6 @@ do
   "src/common/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/common/Makefile" ;;
   "src/common/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/common/Makefile" ;;
   "src/char/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/char/Makefile" ;;
   "src/char/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/char/Makefile" ;;
   "src/login/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/login/Makefile" ;;
   "src/login/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/login/Makefile" ;;
-  "src/ladmin/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/ladmin/Makefile" ;;
   "src/char_sql/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/char_sql/Makefile" ;;
   "src/char_sql/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/char_sql/Makefile" ;;
   "src/txt-converter/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/txt-converter/Makefile" ;;
   "src/txt-converter/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/txt-converter/Makefile" ;;
   "src/map/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/map/Makefile" ;;
   "src/map/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/map/Makefile" ;;

+ 1 - 1
configure.in

@@ -6,7 +6,7 @@ AC_REVISION($Revision$)
 AC_PREREQ([2.59])
 AC_PREREQ([2.59])
 AC_CONFIG_SRCDIR([src/common/cbasetypes.h])
 AC_CONFIG_SRCDIR([src/common/cbasetypes.h])
 AC_CONFIG_FILES([Makefile src/common/Makefile])
 AC_CONFIG_FILES([Makefile src/common/Makefile])
-AC_CONFIG_FILES([src/char/Makefile src/login/Makefile src/ladmin/Makefile])
+AC_CONFIG_FILES([src/char/Makefile src/login/Makefile])
 AC_CONFIG_FILES([src/char_sql/Makefile src/txt-converter/Makefile])
 AC_CONFIG_FILES([src/char_sql/Makefile src/txt-converter/Makefile])
 AC_CONFIG_FILES([src/map/Makefile src/plugins/Makefile src/tool/Makefile])
 AC_CONFIG_FILES([src/map/Makefile src/plugins/Makefile src/tool/Makefile])
 
 

+ 0 - 12
eAthena-10.sln

@@ -14,8 +14,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_sql", "vcproj-10
 EndProject
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-10\mapcache.vcxproj", "{D356871D-58E1-450B-967A-E7E9646175AF}"
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-10\mapcache.vcxproj", "{D356871D-58E1-450B-967A-E7E9646175AF}"
 EndProject
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ladmin", "vcproj-10\ladmin.vcxproj", "{D356871D-58E1-450B-967A-E8E9646175AF}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txt-converter-login", "vcproj-10\txt-converter-login.vcxproj", "{D356871D-58E1-450B-967A-E9E9646175AF}"
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txt-converter-login", "vcproj-10\txt-converter-login.vcxproj", "{D356871D-58E1-450B-967A-E9E9646175AF}"
 EndProject
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txt-converter-char", "vcproj-10\txt-converter-char.vcxproj", "{D356871D-58E1-450B-967A-EAE9646175AF}"
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txt-converter-char", "vcproj-10\txt-converter-char.vcxproj", "{D356871D-58E1-450B-967A-EAE9646175AF}"
@@ -102,16 +100,6 @@ Global
 		{D356871D-58E1-450B-967A-E7E9646175AF}.Release-sql|Win32.Build.0 = Release|Win32
 		{D356871D-58E1-450B-967A-E7E9646175AF}.Release-sql|Win32.Build.0 = Release|Win32
 		{D356871D-58E1-450B-967A-E7E9646175AF}.Release-txt|Win32.ActiveCfg = Release|Win32
 		{D356871D-58E1-450B-967A-E7E9646175AF}.Release-txt|Win32.ActiveCfg = Release|Win32
 		{D356871D-58E1-450B-967A-E7E9646175AF}.Release-txt|Win32.Build.0 = Release|Win32
 		{D356871D-58E1-450B-967A-E7E9646175AF}.Release-txt|Win32.Build.0 = Release|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Debug|Win32.Build.0 = Debug|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Debug-sql|Win32.ActiveCfg = Debug|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Debug-txt|Win32.ActiveCfg = Debug|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Debug-txt|Win32.Build.0 = Debug|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Release|Win32.ActiveCfg = Release|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Release|Win32.Build.0 = Release|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Release-sql|Win32.ActiveCfg = Release|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Release-txt|Win32.ActiveCfg = Release|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Release-txt|Win32.Build.0 = Release|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug|Win32.Build.0 = Debug|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug|Win32.Build.0 = Debug|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug-sql|Win32.ActiveCfg = Debug|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug-sql|Win32.ActiveCfg = Debug|Win32

+ 0 - 12
eAthena-8.sln

@@ -14,8 +14,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_sql", "vcproj-8\
 EndProject
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-8\mapcache.vcproj", "{D356871D-58E1-450B-967A-E7E9646175AF}"
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-8\mapcache.vcproj", "{D356871D-58E1-450B-967A-E7E9646175AF}"
 EndProject
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ladmin", "vcproj-8\ladmin.vcproj", "{D356871D-58E1-450B-967A-E8E9646175AF}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txt-converter-login", "vcproj-8\txt-converter-login.vcproj", "{D356871D-58E1-450B-967A-E9E9646175AF}"
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txt-converter-login", "vcproj-8\txt-converter-login.vcproj", "{D356871D-58E1-450B-967A-E9E9646175AF}"
 EndProject
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txt-converter-char", "vcproj-8\txt-converter-char.vcproj", "{D356871D-58E1-450B-967A-EAE9646175AF}"
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txt-converter-char", "vcproj-8\txt-converter-char.vcproj", "{D356871D-58E1-450B-967A-EAE9646175AF}"
@@ -108,16 +106,6 @@ Global
 		{D356871D-58E1-450B-967A-E7E9646175AF}.Release-sql|Win32.Build.0 = Release|Win32
 		{D356871D-58E1-450B-967A-E7E9646175AF}.Release-sql|Win32.Build.0 = Release|Win32
 		{D356871D-58E1-450B-967A-E7E9646175AF}.Release-txt|Win32.ActiveCfg = Release|Win32
 		{D356871D-58E1-450B-967A-E7E9646175AF}.Release-txt|Win32.ActiveCfg = Release|Win32
 		{D356871D-58E1-450B-967A-E7E9646175AF}.Release-txt|Win32.Build.0 = Release|Win32
 		{D356871D-58E1-450B-967A-E7E9646175AF}.Release-txt|Win32.Build.0 = Release|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Debug|Win32.Build.0 = Debug|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Debug-sql|Win32.ActiveCfg = Debug|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Debug-txt|Win32.ActiveCfg = Debug|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Debug-txt|Win32.Build.0 = Debug|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Release|Win32.ActiveCfg = Release|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Release|Win32.Build.0 = Release|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Release-sql|Win32.ActiveCfg = Release|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Release-txt|Win32.ActiveCfg = Release|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Release-txt|Win32.Build.0 = Release|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug|Win32.Build.0 = Debug|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug|Win32.Build.0 = Debug|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug-sql|Win32.ActiveCfg = Debug|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug-sql|Win32.ActiveCfg = Debug|Win32

+ 0 - 12
eAthena-9.sln

@@ -14,8 +14,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_sql", "vcproj-9\
 EndProject
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-9\mapcache.vcproj", "{D356871D-58E1-450B-967A-E7E9646175AF}"
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-9\mapcache.vcproj", "{D356871D-58E1-450B-967A-E7E9646175AF}"
 EndProject
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ladmin", "vcproj-9\ladmin.vcproj", "{D356871D-58E1-450B-967A-E8E9646175AF}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txt-converter-login", "vcproj-9\txt-converter-login.vcproj", "{D356871D-58E1-450B-967A-E9E9646175AF}"
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txt-converter-login", "vcproj-9\txt-converter-login.vcproj", "{D356871D-58E1-450B-967A-E9E9646175AF}"
 EndProject
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txt-converter-char", "vcproj-9\txt-converter-char.vcproj", "{D356871D-58E1-450B-967A-EAE9646175AF}"
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txt-converter-char", "vcproj-9\txt-converter-char.vcproj", "{D356871D-58E1-450B-967A-EAE9646175AF}"
@@ -108,16 +106,6 @@ Global
 		{D356871D-58E1-450B-967A-E7E9646175AF}.Release-sql|Win32.Build.0 = Release|Win32
 		{D356871D-58E1-450B-967A-E7E9646175AF}.Release-sql|Win32.Build.0 = Release|Win32
 		{D356871D-58E1-450B-967A-E7E9646175AF}.Release-txt|Win32.ActiveCfg = Release|Win32
 		{D356871D-58E1-450B-967A-E7E9646175AF}.Release-txt|Win32.ActiveCfg = Release|Win32
 		{D356871D-58E1-450B-967A-E7E9646175AF}.Release-txt|Win32.Build.0 = Release|Win32
 		{D356871D-58E1-450B-967A-E7E9646175AF}.Release-txt|Win32.Build.0 = Release|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Debug|Win32.Build.0 = Debug|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Debug-sql|Win32.ActiveCfg = Debug|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Debug-txt|Win32.ActiveCfg = Debug|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Debug-txt|Win32.Build.0 = Debug|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Release|Win32.ActiveCfg = Release|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Release|Win32.Build.0 = Release|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Release-sql|Win32.ActiveCfg = Release|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Release-txt|Win32.ActiveCfg = Release|Win32
-		{D356871D-58E1-450B-967A-E8E9646175AF}.Release-txt|Win32.Build.0 = Release|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug|Win32.Build.0 = Debug|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug|Win32.Build.0 = Debug|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug-sql|Win32.ActiveCfg = Debug|Win32
 		{D356871D-58E1-450B-967A-E9E9646175AF}.Debug-sql|Win32.ActiveCfg = Debug|Win32

+ 0 - 1
readme/features.html

@@ -109,7 +109,6 @@ so we will focus mainly on stability for the time being, not new features.
 	<li>2-2 Jobs (Alternate 2nd Jobs)</li>
 	<li>2-2 Jobs (Alternate 2nd Jobs)</li>
 	<li>Super Novice (Alternate 1st Job)</li>
 	<li>Super Novice (Alternate 1st Job)</li>
 	<li>WoE (War of Emperium)</li>
 	<li>WoE (War of Emperium)</li>
-	<li>Remote administration of accounts (ladmin)</li>
 	<li>Weddings</li>
 	<li>Weddings</li>
 	<li>Pet equipped mobs</li>
 	<li>Pet equipped mobs</li>
 	<li>Management of day/night</li>
 	<li>Management of day/night</li>

+ 0 - 130
src/char/char.c

@@ -2176,72 +2176,6 @@ int parse_fromlogin(int fd)
 		}
 		}
 		break;
 		break;
 
 
-		case 0x2726:	// Request to send a broadcast message (no answer)
-			if (RFIFOREST(fd) < 8 || RFIFOREST(fd) < (8 + RFIFOL(fd,4)))
-				return 0;
-			if (RFIFOL(fd,4) < 1)
-				char_log("Receiving a message for broadcast, but message is void.\n");
-			else
-			{
-				// at least 1 map-server
-				ARR_FIND( 0, MAX_MAP_SERVERS, i, server[i].fd >= 0 );
-				if (i == MAX_MAP_SERVERS)
-					char_log("'ladmin': Receiving a message for broadcast, but no map-server is online.\n");
-				else {
-					unsigned char buf[128];
-					char message[4096]; // +1 to add a null terminated if not exist in the packet
-					int lp;
-					char *p;
-					memset(message, '\0', sizeof(message));
-					memcpy(message, RFIFOP(fd,8), RFIFOL(fd,4));
-					message[sizeof(message)-1] = '\0';
-					remove_control_chars(message);
-					// remove all first spaces
-					p = message;
-					while(p[0] == ' ')
-						p++;
-					// if message is only composed of spaces
-					if (p[0] == '\0')
-						char_log("Receiving a message for broadcast, but message is only a lot of spaces.\n");
-					// else send message to all map-servers
-					else {
-						if (RFIFOW(fd,2) == 0) {
-							char_log("'ladmin': Receiving a message for broadcast (message (in yellow): %s)\n",
-							         message);
-							lp = 4;
-						} else {
-							char_log("'ladmin': Receiving a message for broadcast (message (in blue): %s)\n",
-							         message);
-							lp = 8;
-						}
-						// split message to max 80 char
-						while(p[0] != '\0') { // if not finish
-							if (p[0] == ' ') // jump if first char is a space
-								p++;
-							else {
-								char split[80];
-								char* last_space;
-								sscanf(p, "%79[^\t]", split); // max 79 char, any char (\t is control char and control char was removed before)
-								split[sizeof(split)-1] = '\0'; // last char always \0
-								if ((last_space = strrchr(split, ' ')) != NULL) { // searching space from end of the string
-									last_space[0] = '\0'; // replace it by NULL to have correct length of split
-									p++; // to jump the new NULL
-								}
-								p += strlen(split);
-								// send broadcast to all map-servers
-								WBUFW(buf,0) = 0x3800;
-								WBUFW(buf,2) = lp + strlen(split) + 1;
-								WBUFL(buf,4) = 0x65756c62; // only write if in blue (lp = 8)
-								memcpy(WBUFP(buf,lp), split, strlen(split) + 1);
-								mapif_sendall(buf, WBUFW(buf,2));
-							}
-						}
-					}
-				}
-			}
-			RFIFOSKIP(fd,8 + RFIFOL(fd,4));
-		break;
-
 		// reply to an account_reg2 registry request
 		// reply to an account_reg2 registry request
 		case 0x2729:
 		case 0x2729:
 			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
 			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
@@ -2256,54 +2190,6 @@ int parse_fromlogin(int fd)
 		}
 		}
 		break;
 		break;
 
 
-		// Account deletion notification (from login-server)
-		case 0x2730:
-			if (RFIFOREST(fd) < 6)
-				return 0;
-			// Deletion of all characters of the account
-			for(i = 0; i < char_num; i++) {
-				if (char_dat[i].status.account_id == RFIFOL(fd,2)) {
-					char_delete(&char_dat[i].status);
-					if (i < char_num - 1) {
-						memcpy(&char_dat[i], &char_dat[char_num-1], sizeof(struct character_data));
-						// if moved character owns to deleted account, check again it's character
-						if (char_dat[i].status.account_id == RFIFOL(fd,2)) {
-							i--;
-						// Correct moved character reference in the character's owner by [Yor]
-						} else {
-							int j, k;
-							struct char_session_data *sd2;
-							for (j = 0; j < fd_max; j++) {
-								if (session[j] && (sd2 = (struct char_session_data*)session[j]->session_data) &&
-									sd2->account_id == char_dat[char_num-1].status.account_id) {
-									for (k = 0; k < MAX_CHARS; k++) {
-										if (sd2->found_char[k] == char_num-1) {
-											sd2->found_char[k] = i;
-											break;
-										}
-									}
-									break;
-								}
-							}
-						}
-					}
-					char_num--;
-				}
-			}
-			// Deletion of the storage
-			inter_storage_delete(RFIFOL(fd,2));
-			// send to all map-servers to disconnect the player
-			{
-				unsigned char buf[6];
-				WBUFW(buf,0) = 0x2b13;
-				WBUFL(buf,2) = RFIFOL(fd,2);
-				mapif_sendall(buf, 6);
-			}
-			// disconnect player if online on char-server
-			disconnect_player(RFIFOL(fd,2));
-			RFIFOSKIP(fd,6);
-		break;
-
 		// State change of account/ban notification (from login-server)
 		// State change of account/ban notification (from login-server)
 		case 0x2731:
 		case 0x2731:
 			if (RFIFOREST(fd) < 11)
 			if (RFIFOREST(fd) < 11)
@@ -3750,22 +3636,6 @@ int parse_char(int fd)
 		}
 		}
 		return 0; // avoid processing of followup packets here
 		return 0; // avoid processing of followup packets here
 
 
-		// Athena info get
-		case 0x7530:
-			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_INTER | ATHENA_SERVER_CHAR;
-			WFIFOW(fd,8) = ATHENA_MOD_VERSION;
-			WFIFOSET(fd,10);
-
-			RFIFOSKIP(fd,2);
-		break;
-
 		// unknown packet received
 		// unknown packet received
 		default:
 		default:
 			ShowError("parse_char: Received unknown packet "CL_WHITE"0x%x"CL_RESET" from ip '"CL_WHITE"%s"CL_RESET"'! Disconnecting!\n", RFIFOW(fd,0), ip2str(ipl, NULL));
 			ShowError("parse_char: Received unknown packet "CL_WHITE"0x%x"CL_RESET" from ip '"CL_WHITE"%s"CL_RESET"'! Disconnecting!\n", RFIFOW(fd,0), ip2str(ipl, NULL));

+ 0 - 16
src/char_sql/char.c

@@ -3429,22 +3429,6 @@ int parse_char(int fd)
 		}
 		}
 		return 0; // avoid processing of followup packets here
 		return 0; // avoid processing of followup packets here
 
 
-		// Athena info get
-		case 0x7530:
-			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_INTER | ATHENA_SERVER_CHAR;
-			WFIFOW(fd,8) = ATHENA_MOD_VERSION;
-			WFIFOSET(fd,10);
-
-			RFIFOSKIP(fd,2);
-		break;
-
 		// unknown packet received
 		// unknown packet received
 		default:
 		default:
 			ShowError("parse_char: Received unknown packet "CL_WHITE"0x%x"CL_RESET" from ip '"CL_WHITE"%s"CL_RESET"'! Disconnecting!\n", RFIFOW(fd,0), ip2str(ipl, NULL));
 			ShowError("parse_char: Received unknown packet "CL_WHITE"0x%x"CL_RESET" from ip '"CL_WHITE"%s"CL_RESET"'! Disconnecting!\n", RFIFOW(fd,0), ip2str(ipl, NULL));

+ 0 - 45
src/ladmin/Makefile.in

@@ -1,45 +0,0 @@
-
-COMMON_OBJ = ../common/obj_all/minicore.o ../common/obj_all/minisocket.o ../common/obj_all/timer.o \
-	../common/obj_all/malloc.o ../common/obj_all/showmsg.o ../common/obj_all/strlib.o \
-	../common/obj_all/utils.o ../common/obj_all/md5calc.o
-COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h \
-	../common/version.h ../common/malloc.h ../common/showmsg.h ../common/strlib.h \
-	../common/utils.h ../common/md5calc.h ../common/cbasetypes.h
-
-LADMIN_OBJ = obj_all/ladmin.o
-LADMIN_H = ladmin.h
-
-@SET_MAKE@
-
-#####################################################################
-.PHONY : all ladmin clean help
-
-all: ladmin
-
-ladmin: obj_all $(LADMIN_OBJ) $(COMMON_OBJ)
-	@CC@ @LDFLAGS@ -o ../../ladmin@EXEEXT@ $(LADMIN_OBJ) $(COMMON_OBJ) @LIBS@
-
-clean:
-	rm -rf *.o obj_all ../../ladmin@EXEEXT@
-
-help:
-	@echo "possible targets are 'ladmin' 'all' 'clean' 'help'"
-	@echo "'ladmin'  - remote administration tool"
-	@echo "'all'     - builds all above targets"
-	@echo "'clean'   - cleans builds and objects"
-	@echo "'help'    - outputs this message"
-
-#####################################################################
-
-obj_all:
-	-mkdir obj_all
-
-obj_all/%.o: %.c $(LADMIN_H) $(COMMON_H)
-	@CC@ @CFLAGS@ @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
-
-# missing common object files
-../common/obj_all/%.o:
-	@$(MAKE) -C ../common txt
-
-../common/obj_all/mini%.o:
-	@$(MAKE) -C ../common txt

+ 0 - 3074
src/ladmin/ladmin.c

@@ -1,3074 +0,0 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
-
-///////////////////////////////////////////////////////////////////////////
-// EAthena login-server remote administration tool
-///////////////////////////////////////////////////////////////////////////
-
-#include "../common/cbasetypes.h"
-#include "../common/core.h"
-#include "../common/strlib.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/version.h"
-#include "../common/mmo.h"
-#include "../common/md5calc.h"
-#include "../common/showmsg.h"
-#include "ladmin.h"
-
-#include <sys/types.h>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <fcntl.h>
-#include <string.h> // str*
-#include <stdarg.h> // valist
-
-
-//-------------------------------INSTRUCTIONS------------------------------
-// Set the variables below:
-//   IP of the login server.
-//   Port where the login-server listens incoming packets.
-//   Password of administration (same of config_athena.conf).
-// IMPORTANT:
-//   Be sure that you authorize remote administration in login-server
-//   (see login_athena.conf, 'admin_state' parameter)
-//-------------------------------------------------------------------------
-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 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.
-//    You must type a minimum of letters (you can not type 'a',
-//      because ladmin doesn't know if it's for 'aide' or for 'add')
-//    <Example> q <= quit, li <= list, pass <= passwd, etc.
-//
-//  Note: every time you must give a account_name, you can use "" or '' (spaces can be included)
-//
-//  aide/help/?
-//    Display the description of the commands
-//  aide/help/? [command]
-//    Display the description of the specified command
-//
-//  add <account_name> <sex> <password>
-//    Create an account with the default email (a@a.com).
-//    Concerning the sex, only the first letter is used (F or M).
-//    The e-mail is set to a@a.com (default e-mail). It's like to have no e-mail.
-//    When the password is omitted, the input is done without displaying of the pressed keys.
-//    <example> add testname Male testpass
-//
-//  ban/banish yyyy/mm/dd hh:mm:ss <account name>
-//    Changes the final date of a banishment of an account.
-//    Like banset, but <account name> is at end.
-//
-//  banadd <account_name> <modifier>
-//    Adds or substracts time from the final date of a banishment of an account.
-//    Modifier is done as follows:
-//      Adjustment value (-1, 1, +1, etc...)
-//      Modified element:
-//        a or y: year
-//        m:  month
-//        j or d: day
-//        h:  hour
-//        mn: minute
-//        s:  second
-//    <example> banadd testname +1m-2mn1s-6y
-//              this example adds 1 month and 1 second, and substracts 2 minutes and 6 years at the same time.
-//  NOTE: If you modify the final date of a non-banished account,
-//        you fix the final date to (actual time +- adjustments)
-//
-//  banset <account_name> yyyy/mm/dd [hh:mm:ss]
-//    Changes the final date of a banishment of an account.
-//    Default time [hh:mm:ss]: 23:59:59.
-//  banset <account_name> 0
-//    Set a non-banished account (0 = unbanished).
-//
-//  block <account name>
-//    Set state 5 (You have been blocked by the GM Team) to an account.
-//    Like state <account name> 5.
-//
-//  check <account_name> <password>
-//    Check the validity of a password for an account
-//    NOTE: Server will never send back a password.
-//          It's the only method you have to know if a password is correct.
-//          The other method is to have a ('physical') access to the accounts file.
-//
-//  create <account_name> <sex> <email> <password>
-//    Like the 'add' command, but with e-mail moreover.
-//    <example> create testname Male my@mail.com testpass
-//
-//  del <account name>
-//    Remove an account.
-//    This order requires confirmation. After confirmation, the account is deleted.
-//
-//  email <account_name> <email>
-//    Modify the e-mail of an account.
-//
-//  getcount
-//    Give the number of players online on all char-servers.
-//
-//  gm <account_name> [GM_level]
-//    Modify the GM level of an account.
-//    Default value remove GM level (GM level = 0).
-//    <example> gm testname 80
-//
-//  id <account name>
-//    Give the id of an account.
-//
-//  info <account_id>
-//    Display complete information of an account.
-//
-//  kami <message>
-//    Sends a broadcast message on all map-server (in yellow).
-//  kamib <message>
-//    Sends a broadcast message on all map-server (in blue).
-//
-//  list/ls [start_id [end_id]]
-//    Display a list of accounts.
-//    'start_id', 'end_id': indicate end and start identifiers.
-//    Research by name is not possible with this command.
-//    <example> list 10 9999999
-//
-//  listBan/lsBan [start_id [end_id]]
-//    Like list/ls, but only for accounts with state or banished
-//
-//  listGM/lsGM [start_id [end_id]]
-//    Like list/ls, but only for GM accounts
-//
-//  listOK/lsOK [start_id [end_id]]
-//    Like list/ls, but only for accounts without state and not banished
-//
-//  memo <account_name> <memo>
-//    Modify the memo of an account.
-//    'memo': it can have until 253 characters (with spaces or not).
-//
-//  name <account_id>
-//    Give the name of an account.
-//
-//  passwd <account_name> <new_password>
-//    Change the password of an account.
-//    When new password is omitted, the input is done without displaying of the pressed keys.
-//
-//  quit/end/exit
-//    End of the program of administration
-//
-//  reloadGM
-//    Reload GM configuration file
-//
-//  search <expression>
-//    Seek accounts.
-//    Displays the accounts whose names correspond.
-//  search -r/-e/--expr/--regex <expression>
-//    Seek accounts by regular expression.
-//    Displays the accounts whose names correspond.
-//
-//  sex <account_name> <sex>
-//    Modify the sex of an account.
-//    <example> sex testname Male
-//
-//  state <account_name> <new_state> <error_message_#7>
-//    Change the state of an account.
-//    'new_state': state is the state of the packet 0x006a + 1. The possibilities are:
-//                 0 = Account ok            6 = Your Game's EXE file is not the latest version
-//                 1 = Unregistered ID       7 = You are Prohibited to log in until %s
-//                 2 = Incorrect Password    8 = Server is jammed due to over populated
-//                 3 = This ID is expired    9 = No MSG
-//                 4 = Rejected from Server  100 = This ID has been totally erased
-//                 5 = You have been blocked by the GM Team
-//                 all other values are 'No MSG', then use state 9 please.
-//    'error_message_#7': message of the code error 6 = Your are Prohibited to log in until %s (packet 0x006a)
-//
-//  timeadd <account_name> <modifier>
-//    Adds or substracts time from the validity limit of an account.
-//    Modifier is done as follows:
-//      Adjustment value (-1, 1, +1, etc...)
-//      Modified element:
-//        a or y: year
-//        m:  month
-//        j or d: day
-//        h:  hour
-//        mn: minute
-//        s:  second
-//    <example> timeadd testname +1m-2mn1s-6y
-//              this example adds 1 month and 1 second, and substracts 2 minutes and 6 years at the same time.
-//  NOTE: You can not modify a unlimited validity limit.
-//        If you want modify it, you want probably create a limited validity limit.
-//        So, at first, you must set the validity limit to a date/time.
-//
-//  timeset <account_name> yyyy/mm/dd [hh:mm:ss]
-//    Changes the validity limit of an account.
-//    Default time [hh:mm:ss]: 23:59:59.
-//  timeset <account_name> 0
-//    Gives an unlimited validity limit (0 = unlimited).
-//
-//  unban/unbanish <account name>
-//    Unban an account.
-//    Like banset <account name> 0.
-//
-//  unblock <account name>
-//    Set state 0 (Account ok) to an account.
-//    Like state <account name> 0.
-//
-//  version
-//    Display the version of the login-server.
-//
-//  who <account name>
-//    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
-char command[1024];
-char parameters[1024];
-int list_first, list_last, list_type, list_count; // parameter to display a list of accounts
-int already_exit_function = 0; // sometimes, the exit function is called twice... so, don't log twice the message
-
-//------------------------------
-// Writing function of logs file
-//------------------------------
-int ladmin_log(char *fmt, ...)
-{
-	FILE *logfp;
-	va_list ap;
-	time_t t;
-	char tmpstr[2048];
-
-	va_start(ap, fmt);
-
-	logfp = fopen(ladmin_log_filename, "a");
-	if (logfp) {
-		if (fmt[0] == '\0') // jump a line if no message
-			fprintf(logfp, "\n");
-		else {
-			t = time(NULL);
-			strftime(tmpstr, 24, date_format, localtime(&t));
-			sprintf(tmpstr + strlen(tmpstr), ": %s", fmt);
-			vfprintf(logfp, tmpstr, ap);
-		}
-		fclose(logfp);
-	}
-
-	va_end(ap);
-	return 0;
-}
-
-//---------------------------------------------
-// Function to return ordinal text of a number.
-//---------------------------------------------
-char* makeordinal(int number)
-{
-	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";
-	}
-}
-
-//-----------------------------------------------------------------------------------------
-// Function to test of the validity of an account name (return 0 if incorrect, and 1 if ok)
-//-----------------------------------------------------------------------------------------
-int verify_accountname(char* account_name)
-{
-	int i;
-
-	for(i = 0; account_name[i]; i++) {
-		if (account_name[i] < 32) {
-			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) {
-		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) {
-		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;
-	}
-
-	return 1;
-}
-
-//----------------------------------
-// Sub-function: Input of a password
-//----------------------------------
-int typepasswd(char * password)
-{
-	char password1[1023], password2[1023];
-	int letter;
-	int i;
-
-	ladmin_log("No password was given. Request to obtain a password.\n");
-
-	memset(password1, '\0', sizeof(password1));
-	memset(password2, '\0', sizeof(password2));
-
-	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) {
-		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;
-	}
-	ladmin_log("Typed password: %s.\n", password1);
-	strcpy(password, password1);
-	return 1;
-}
-
-//------------------------------------------------------------------------------------
-// Sub-function: Test of the validity of password (return 0 if incorrect, and 1 if ok)
-//------------------------------------------------------------------------------------
-int verify_password(char * password)
-{
-	int i;
-
-	for(i = 0; password[i]; i++) {
-		if (password[i] < 32) {
-			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) {
-		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) {
-		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;
-	}
-
-	return 1;
-}
-
-//------------------------------------------------------------------
-// Sub-function: Check the name of a command (return complete name)
-//-----------------------------------------------------------------
-int check_command(char * command)
-{
-// help
-	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'?
-		strcpy(command, "add");
-	else if ((strncmp(command, "ban", 3) == 0 && strncmp(command, "ban", strlen(command)) == 0) ||
-	         (strncmp(command, "banish", 4) == 0 && strncmp(command, "banish", strlen(command)) == 0))
-		strcpy(command, "ban");
-	else if ((strncmp(command, "banadd", 4) == 0 && strncmp(command, "banadd", strlen(command)) == 0) || // not 1 letter command: 'ba' or 'bs'? 'banadd' or 'banset' ?
-	         strcmp(command,   "ba") == 0)
-		strcpy(command, "banadd");
-	else if ((strncmp(command, "banset", 4) == 0 && strncmp(command, "banset", strlen(command)) == 0) || // not 1 letter command: 'ba' or 'bs'? 'banadd' or 'banset' ?
-	         strcmp(command,   "bs") == 0)
-		strcpy(command, "banset");
-	else if (strncmp(command, "block", 2) == 0 && strncmp(command, "block", strlen(command)) == 0)
-		strcpy(command, "block");
-	else if (strncmp(command, "check", 2) == 0 && strncmp(command, "check", strlen(command)) == 0) // not 1 letter command: 'check' or 'create'?
-		strcpy(command, "check");
-	else if (strncmp(command, "create", 2) == 0 && strncmp(command, "create", strlen(command)) == 0) // not 1 letter command: 'check' or 'create'?
-		strcpy(command, "create");
-	else if (strncmp(command, "delete", 1) == 0 && strncmp(command, "delete", strlen(command)) == 0)
-		strcpy(command, "delete");
-	else if ((strncmp(command, "email", 2) == 0 && strncmp(command, "email", strlen(command)) == 0) || // not 1 letter command: 'email', 'end' or 'exit'?
-	         (strncmp(command, "e-mail", 2) == 0 && strncmp(command, "e-mail", strlen(command)) == 0))
-		strcpy(command, "email");
-	else if (strncmp(command, "getcount", 2) == 0 && strncmp(command, "getcount", strlen(command)) == 0) // not 1 letter command: 'getcount' or 'gm'?
-		strcpy(command, "getcount");
-//	else if (strncmp(command, "gm", 2) == 0 && strncmp(command, "gm", strlen(command)) == 0) // not 1 letter command: 'getcount' or 'gm'?
-//		strcpy(command, "gm");
-//	else if (strncmp(command, "id", 2) == 0 && strncmp(command, "id", strlen(command)) == 0) // not 1 letter command: 'id' or 'info'?
-//		strcpy(command, "id");
-	else if (strncmp(command, "info", 2) == 0 && strncmp(command, "info", strlen(command)) == 0) // not 1 letter command: 'id' or 'info'?
-		strcpy(command, "info");
-//	else if (strncmp(command, "kami", 4) == 0 && strncmp(command, "kami", strlen(command)) == 0) // only all letters command: 'kami' or 'kamib'?
-//		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, "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) ||
-	         (strncmp(command, "lsban", 3) == 0 && strncmp(command, "lsban", strlen(command)) == 0) ||
-	         strcmp(command, "lb") == 0)
-		strcpy(command, "listban");
-	else if ((strncmp(command, "listgm", 5) == 0 && strncmp(command, "listgm", strlen(command)) == 0) ||
-	         (strncmp(command, "lsgm", 3) == 0 && strncmp(command, "lsgm", strlen(command)) == 0) ||
-	         strcmp(command,  "lg") == 0)
-		strcpy(command, "listgm");
-	else if ((strncmp(command, "listok", 5) == 0 && strncmp(command, "listok", strlen(command)) == 0) ||
-	         (strncmp(command, "lsok", 3) == 0 && strncmp(command, "lsok", strlen(command)) == 0) ||
-	         strcmp(command, "lo") == 0)
-		strcpy(command, "listok");
-	else if (strncmp(command, "memo", 1) == 0 && strncmp(command, "memo", strlen(command)) == 0)
-		strcpy(command, "memo");
-	else if (strncmp(command, "name", 1) == 0 && strncmp(command, "name", strlen(command)) == 0)
-		strcpy(command, "name");
-	else if ((strncmp(command, "password", 1) == 0 && strncmp(command, "password", strlen(command)) == 0) ||
-	         strcmp(command, "passwd") == 0)
-		strcpy(command, "password");
-	else if (strncmp(command, "reloadgm", 1) == 0 && strncmp(command, "reloadgm", strlen(command)) == 0)
-		strcpy(command, "reloadgm");
-	else if (strncmp(command, "search", 3) == 0 && strncmp(command, "search", strlen(command)) == 0) // not 1 letter command: 'search', 'state' or 'sex'?
-		strcpy(command, "search"); // not 2 letters command: 'search' or 'sex'?
-//	else if (strncmp(command, "sex", 3) == 0 && strncmp(command, "sex", strlen(command)) == 0) // not 1 letter command: 'search', 'state' or 'sex'?
-//		strcpy(command, "sex"); // not 2 letters command: 'search' or 'sex'?
-	else if (strncmp(command, "state", 2) == 0 && strncmp(command, "state", strlen(command)) == 0) // not 1 letter command: 'search', 'state' or 'sex'?
-		strcpy(command, "state");
-	else if ((strncmp(command, "timeadd", 5) == 0 && strncmp(command, "timeadd", strlen(command)) == 0) || // not 1 letter command: 'ta' or 'ts'? 'timeadd' or 'timeset'?
-	         strcmp(command,  "ta") == 0)
-		strcpy(command, "timeadd");
-	else if ((strncmp(command, "timeset", 5) == 0 && strncmp(command, "timeset", strlen(command)) == 0) || // not 1 letter command: 'ta' or 'ts'? 'timeadd' or 'timeset'?
-	         strcmp(command,  "ts") == 0)
-		strcpy(command, "timeset");
-	else if ((strncmp(command, "unban", 5) == 0 && strncmp(command, "unban", strlen(command)) == 0) ||
-	         (strncmp(command, "unbanish", 4) == 0 && strncmp(command, "unbanish", strlen(command)) == 0))
-		strcpy(command, "unban");
-	else if (strncmp(command, "unblock", 4) == 0 && strncmp(command, "unblock", strlen(command)) == 0)
-		strcpy(command, "unblock");
-	else if (strncmp(command, "version", 1) == 0 && strncmp(command, "version", strlen(command)) == 0)
-		strcpy(command, "version");
-	else if (strncmp(command, "who", 1) == 0 && strncmp(command, "who", strlen(command)) == 0)
-		strcpy(command, "who");
-// quit
-	else if (strncmp(command, "quit", 1) == 0 && strncmp(command, "quit", strlen(command)) == 0)
-		strcpy(command, "quit");
-	else if (strncmp(command, "exit", 2) == 0 && strncmp(command, "exit", strlen(command)) == 0) // not 1 letter command: 'email', 'end' or 'exit'?
-		strcpy(command, "exit");
-	else if (strncmp(command, "end", 2) == 0 && strncmp(command, "end", strlen(command)) == 0) // not 1 letter command: 'email', 'end' or 'exit'?
-		strcpy(command, "end");
-
-	return 0;
-}
-
-//-----------------------------------------
-// Sub-function: Display commands of ladmin
-//-----------------------------------------
-void display_help(char* param)
-{
-	char command[1023];
-	int i;
-
-	memset(command, '\0', sizeof(command));
-
-	if (sscanf(param, "%s ", command) < 1 || strlen(command) == 0)
-		strcpy(command, ""); // any value that is not a command
-
-	if (command[0] == '?')
-		strcpy(command, "help");
-
-	// lowercase for command
-	for (i = 0; command[i]; i++)
-		command[i] = TOLOWER(command[i]);
-
-	// Analyse of the command
-	check_command(command); // give complete name to the command
-
-	ladmin_log("Displaying of the commands or a 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 <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");
-// 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");
-// 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(" 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");
-	}
-}
-
-//-----------------------------
-// Sub-function: add an account
-//-----------------------------
-int addaccount(char* param, int emailflag)
-{
-	char name[1023], sex[1023], email[1023], password[1023];
-//	int i;
-	WFIFOHEAD(login_fd,91);
-
-	memset(name, '\0', sizeof(name));
-	memset(sex, '\0', sizeof(sex));
-	memset(email, '\0', sizeof(email));
-	memset(password, '\0', sizeof(password));
-
-	if (emailflag == 0) { // add command
-		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
-			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
-	} else { // 1: create command
-		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
-			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;
-		}
-	}
-	if (verify_accountname(name) == 0) {
-		return 102;
-	}
-
-	sex[0] = TOUPPER(sex[0]);
-	if (strchr("MF", sex[0]) == NULL) {
-		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) {
-		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) {
-		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) {
-		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 (strlen(password) == 0) {
-		if (typepasswd(password) == 0)
-			return 108;
-	}
-	if (verify_password(password) == 0)
-		return 104;
-
-	ladmin_log("Request to login-server to create an account.\n");
-
-	WFIFOW(login_fd,0) = 0x7930;
-	memcpy(WFIFOP(login_fd,2), name, 24);
-	memcpy(WFIFOP(login_fd,26), password, 24);
-	WFIFOB(login_fd,50) = sex[0];
-	memcpy(WFIFOP(login_fd,51), email, 40);
-	WFIFOSET(login_fd,91);
-	bytes_to_read = 1;
-
-	return 0;
-}
-
-//---------------------------------------------------------------------------------
-// Sub-function: Add/substract time to the final date of a banishment of an account
-//---------------------------------------------------------------------------------
-int banaddaccount(char* param)
-{
-	char name[1023], modif[1023];
-	int year, month, day, hour, minute, second;
-	char * p_modif;
-	int value, i;
-	WFIFOHEAD(login_fd,38);
-
-	memset(name, '\0', sizeof(name));
-	memset(modif, '\0', sizeof(modif));
-	year = month = day = hour = minute = second = 0;
-
-	if (sscanf(param, "\"%[^\"]\" %[^\r\n]", name, modif) < 2 &&
-	    sscanf(param, "'%[^']' %[^\r\n]", name, modif) < 2 &&
-	    sscanf(param, "%s %[^\r\n]", name, modif) < 2) {
-		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) {
-		return 102;
-	}
-
-	// lowercase for modif
-	for (i = 0; modif[i]; i++)
-		modif[i] = TOLOWER(modif[i]);
-	p_modif = modif;
-	while (strlen(p_modif) > 0) {
-		value = atoi(p_modif);
-		if (value == 0) {
-			p_modif++;
-		} else {
-			if (p_modif[0] == '-' || p_modif[0] == '+')
-				p_modif++;
-			while (strlen(p_modif) > 0 && p_modif[0] >= '0' && p_modif[0] <= '9') {
-				p_modif++;
-			}
-			if (p_modif[0] == 's') {
-				second = value;
-				p_modif++;
-			} else if (p_modif[0] == 'm' && p_modif[1] == 'n') {
-				minute = value;
-				p_modif += 2;
-			} else if (p_modif[0] == 'h') {
-				hour = value;
-				p_modif++;
-			} else if (p_modif[0] == 'd' || p_modif[0] == 'j') {
-				day = value;
-				p_modif += 2;
-			} else if (p_modif[0] == 'm') {
-				month = value;
-				p_modif++;
-			} else if (p_modif[0] == 'y' || p_modif[0] == 'a') {
-				year = value;
-				p_modif++;
-			} else {
-				p_modif++;
-			}
-		}
-	}
-
-	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) {
-		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) {
-		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) {
-		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) {
-		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) {
-		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) {
-		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) {
-		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;
-	}
-
-	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);
-	WFIFOW(login_fd,26) = (short)year;
-	WFIFOW(login_fd,28) = (short)month;
-	WFIFOW(login_fd,30) = (short)day;
-	WFIFOW(login_fd,32) = (short)hour;
-	WFIFOW(login_fd,34) = (short)minute;
-	WFIFOW(login_fd,36) = (short)second;
-	WFIFOSET(login_fd,38);
-	bytes_to_read = 1;
-
-	return 0;
-}
-
-//-----------------------------------------------------------------------
-// Sub-function of sub-function banaccount, unbanaccount or bansetaccount
-// Set the final date of a banishment of an account
-//-----------------------------------------------------------------------
-int bansetaccountsub(char* name, char* date, char* time)
-{
-	int year, month, day, hour, minute, second;
-	time_t unban_time; // # of seconds 1/1/1970 (timestamp): ban time limit of the account (0 = no ban)
-	struct tm *tmtime;
-	WFIFOHEAD(login_fd,30);
-
-	year = month = day = hour = minute = second = 0;
-	unban_time = 0;
-	tmtime = localtime(&unban_time); // initialize
-
-	if (verify_accountname(name) == 0) {
-		return 102;
-	}
-
-	if (atoi(date) != 0 &&
-	    ((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))
-	{
-		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;
-	}
-
-	if (atoi(date) == 0) {
-		unban_time = 0;
-	} else {
-		if (year < 70) {
-			year = year + 100;
-		}
-		if (year >= 1900) {
-			year = year - 1900;
-		}
-		if (month < 1 || month > 12) {
-			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) {
-			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)) {
-			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) {
-			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) {
-			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) {
-			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;
-		tmtime->tm_mon = month;
-		tmtime->tm_mday = day;
-		tmtime->tm_hour = hour;
-		tmtime->tm_min = minute;
-		tmtime->tm_sec = second;
-		tmtime->tm_isdst = -1; // -1: no winter/summer time modification
-		unban_time = mktime(tmtime);
-		if (unban_time == -1) {
-			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;
-		}
-	}
-
-	ladmin_log("Request to login-server to set a ban.\n");
-
-	WFIFOW(login_fd,0) = 0x794a;
-	memcpy(WFIFOP(login_fd,2), name, 24);
-	WFIFOL(login_fd,26) = (int)unban_time;
-	WFIFOSET(login_fd,30);
-	bytes_to_read = 1;
-
-	return 0;
-}
-
-//---------------------------------------------------------------------
-// Sub-function: Set the final date of a banishment of an account (ban)
-//---------------------------------------------------------------------
-int banaccount(char* param)
-{
-	char name[1023], date[1023], time[1023];
-
-	memset(name, '\0', sizeof(name));
-	memset(date, '\0', sizeof(date));
-	memset(time, '\0', sizeof(time));
-
-	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) {
-		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;
-	}
-
-	return bansetaccountsub(name, date, time);
-}
-
-//------------------------------------------------------------------------
-// Sub-function: Set the final date of a banishment of an account (banset)
-//------------------------------------------------------------------------
-int bansetaccount(char* param)
-{
-	char name[1023], date[1023], time[1023];
-
-	memset(name, '\0', sizeof(name));
-	memset(date, '\0', sizeof(date));
-	memset(time, '\0', sizeof(time));
-
-	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
-		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;
-	}
-
-	if (time[0] == '\0')
-		strcpy(time, "23:59:59");
-
-	return bansetaccountsub(name, date, time);
-}
-
-//-------------------------------------------------
-// Sub-function: unbanishment of an account (unban)
-//-------------------------------------------------
-int unbanaccount(char* param)
-{
-	char name[1023];
-
-	memset(name, '\0', sizeof(name));
-
-	if (strlen(param) == 0 ||
-	    (sscanf(param, "\"%[^\"]\"", name) < 1 &&
-	     sscanf(param, "'%[^']'", name) < 1 &&
-	     sscanf(param, "%[^\r\n]", name) < 1) ||
-	     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;
-	}
-
-	return bansetaccountsub(name, "0", "");
-}
-
-//---------------------------------------------------------
-// Sub-function: Asking to check the validity of a password
-// (Note: never send back a password with login-server!! security of passwords)
-//---------------------------------------------------------
-int checkaccount(char* param)
-{
-	char name[1023], password[1023];
-	WFIFOHEAD(login_fd,50);
-
-	memset(name, '\0', sizeof(name));
-	memset(password, '\0', sizeof(password));
-
-	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
-		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;
-	}
-
-	if (verify_accountname(name) == 0) {
-		return 102;
-	}
-
-	if (strlen(password) == 0) {
-		if (typepasswd(password) == 0)
-			return 134;
-	}
-	if (verify_password(password) == 0)
-		return 131;
-
-	ladmin_log("Request to login-server to check a password.\n");
-
-	WFIFOW(login_fd,0) = 0x793a;
-	memcpy(WFIFOP(login_fd,2), name, 24);
-	memcpy(WFIFOP(login_fd,26), password, 24);
-	WFIFOSET(login_fd,50);
-	bytes_to_read = 1;
-
-	return 0;
-}
-
-//------------------------------------------------
-// Sub-function: Asking for deletion of an account
-//------------------------------------------------
-int delaccount(char* param)
-{
-	char name[1023];
-	char letter;
-	char confirm[1023];
-	int i;
-	WFIFOHEAD(login_fd,26);
-
-	memset(name, '\0', sizeof(name));
-
-	if (strlen(param) == 0 ||
-	    (sscanf(param, "\"%[^\"]\"", name) < 1 &&
-	     sscanf(param, "'%[^']'", name) < 1 &&
-	     sscanf(param, "%[^\r\n]", name) < 1) ||
-	     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;
-	}
-
-	if (verify_accountname(name) == 0) {
-		return 102;
-	}
-
-	memset(confirm, '\0', sizeof(confirm));
-	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;
-		while ((letter = getchar()) != '\n')
-			confirm[i++] = letter;
-	}
-
-	if (confirm[0] == 'n') {
-		ShowMessage("Deletion canceled.\n");
-		ladmin_log("Deletion canceled by user ('delete' command).\n");
-		return 121;
-	}
-
-	ladmin_log("Request to login-server to delete an acount.\n");
-
-	WFIFOW(login_fd,0) = 0x7932;
-	memcpy(WFIFOP(login_fd,2), name, 24);
-	WFIFOSET(login_fd,26);
-	bytes_to_read = 1;
-
-	return 0;
-}
-
-//----------------------------------------------------------
-// Sub-function: Asking to modification of an account e-mail
-//----------------------------------------------------------
-int changeemail(char* param)
-{
-	char name[1023], email[1023];
-	WFIFOHEAD(login_fd,66);
-
-	memset(name, '\0', sizeof(name));
-	memset(email, '\0', sizeof(email));
-
-	if (sscanf(param, "\"%[^\"]\" %[^\r\n]", name, email) < 2 &&
-	    sscanf(param, "'%[^']' %[^\r\n]", name, email) < 2 &&
-	    sscanf(param, "%s %[^\r\n]", name, email) < 2) {
-		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;
-	}
-
-	if (verify_accountname(name) == 0) {
-		return 102;
-	}
-
-	if (strlen(email) < 3) {
-		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) {
-		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) {
-		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;
-	}
-
-	ladmin_log("Request to login-server to change an email.\n");
-
-	WFIFOW(login_fd,0) = 0x7940;
-	memcpy(WFIFOP(login_fd,2), name, 24);
-	memcpy(WFIFOP(login_fd,26), email, 40);
-	WFIFOSET(login_fd,66);
-	bytes_to_read = 1;
-
-	return 0;
-}
-
-//-----------------------------------------------------
-// Sub-function: Asking of the number of online players
-//-----------------------------------------------------
-int getlogincount(void)
-{
-	WFIFOHEAD(login_fd,2);
-	ladmin_log("Request to login-server to obtain the # of online players.\n");
-
-	WFIFOW(login_fd,0) = 0x7938;
-	WFIFOSET(login_fd,2);
-	bytes_to_read = 1;
-
-	return 0;
-}
-
-//----------------------------------------------------------
-// Sub-function: Asking to modify the GM level of an account
-//----------------------------------------------------------
-int changegmlevel(char* param)
-{
-	char name[1023];
-	int GM_level;
-	WFIFOHEAD(login_fd,27);
-
-	memset(name, '\0', sizeof(name));
-	GM_level = 0;
-
-	if (sscanf(param, "\"%[^\"]\" %d", name, &GM_level) < 1 &&
-	    sscanf(param, "'%[^']' %d", name, &GM_level) < 1 &&
-	    sscanf(param, "%s %d", name, &GM_level) < 1) {
-		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;
-	}
-
-	if (verify_accountname(name) == 0) {
-		return 102;
-	}
-
-	if (GM_level < 0 || GM_level > 99) {
-		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;
-	}
-
-	ladmin_log("Request to login-server to change a GM level.\n");
-
-	WFIFOW(login_fd,0) = 0x793e;
-	memcpy(WFIFOP(login_fd,2), name, 24);
-	WFIFOB(login_fd,26) = GM_level;
-	WFIFOSET(login_fd,27);
-	bytes_to_read = 1;
-
-	return 0;
-}
-
-//---------------------------------------------
-// Sub-function: Asking to obtain an account id
-//---------------------------------------------
-int idaccount(char* param)
-{
-	char name[1023];
-	WFIFOHEAD(login_fd,26);
-
-	memset(name, '\0', sizeof(name));
-
-	if (strlen(param) == 0 ||
-	    (sscanf(param, "\"%[^\"]\"", name) < 1 &&
-	     sscanf(param, "'%[^']'", name) < 1 &&
-	     sscanf(param, "%[^\r\n]", name) < 1) ||
-	     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;
-	}
-
-	if (verify_accountname(name) == 0) {
-		return 102;
-	}
-
-	ladmin_log("Request to login-server to know an account id.\n");
-
-	WFIFOW(login_fd,0) = 0x7944;
-	memcpy(WFIFOP(login_fd,2), name, 24);
-	WFIFOSET(login_fd,26);
-	bytes_to_read = 1;
-
-	return 0;
-}
-
-//----------------------------------------------------------------------------
-// Sub-function: Asking to displaying information about an account (by its id)
-//----------------------------------------------------------------------------
-int infoaccount(int account_id)
-{
-	WFIFOHEAD(login_fd,6);
-	if (account_id < 0) {
-		ShowMessage("Please input a positive value for the id.\n");
-		ladmin_log("Negative value was given to found the account.\n");
-		return 136;
-	}
-
-	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;
-	WFIFOSET(login_fd,6);
-	bytes_to_read = 1;
-
-	return 0;
-}
-
-//---------------------------------------
-// Sub-function: Send a broadcast message
-//---------------------------------------
-int sendbroadcast(short type, char* message)
-{
-	int len = strlen(message);
-	WFIFOHEAD(login_fd,9+len);
-	if (len == 0) {
-		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");
-		return 136;
-	}
-	len++; //+'\0'
-	WFIFOW(login_fd,0) = 0x794e;
-	WFIFOW(login_fd,2) = type;
-	WFIFOL(login_fd,4) = len;
-	memcpy(WFIFOP(login_fd,8), message, len);
-	WFIFOSET(login_fd,8+len);
-	bytes_to_read = 1;
-
-	return 0;
-}
-
-//--------------------------------------------------------
-// Sub-function: Asking to Displaying of the accounts list
-//--------------------------------------------------------
-int listaccount(char* param, int type)
-{
-//int list_first, list_last, list_type; // parameter to display a list of accounts
-	int i;
-	WFIFOHEAD(login_fd,10);
-
-	list_type = type;
-
-	// set default values
-	list_first = 0;
-	list_last = 0;
-
-	if (list_type == 1) { // if listgm
-		// get all accounts = use default
-	} else if (list_type == 2) { // if search
-		for (i = 0; param[i]; i++)
-			param[i] = TOLOWER(param[i]);
-		// get all accounts = use default
-	} else if (list_type == 3) { // if listban
-		// get all accounts = use default
-	} else if (list_type == 4) { // if listok
-		// get all accounts = use default
-	} else { // if list (list_type == 0)
-		switch(sscanf(param, "%d %d", &list_first, &list_last)) {
-		case 0:
-			// get all accounts = use default
-			break;
-		case 1:
-			list_last = 0;
-			// use tests of the following value
-		default:
-			if (list_first < 0)
-				list_first = 0;
-			if (list_last < list_first || list_last < 0)
-				list_last = 0;
-			break;
-		}
-	}
-
-	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;
-	WFIFOL(login_fd,6) = list_last;
-	WFIFOSET(login_fd,10);
-	bytes_to_read = 1;
-
-	//          0123456789 01 01234567890123456789012301234 012345 0123456789012345678901234567
-	ShowMessage("account_id GM user_name               sex    count state\n");
-	ShowMessage("-------------------------------------------------------------------------------\n");
-	list_count = 0;
-
-	return 0;
-}
-
-//--------------------------------------------
-// Sub-function: Asking to modify a memo field
-//--------------------------------------------
-int changememo(char* param)
-{
-	char name[1023], memo[1023];
-	WFIFOHEAD(login_fd,28+255);
-
-	memset(name, '\0', sizeof(name));
-	memset(memo, '\0', sizeof(memo));
-
-	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
-		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;
-	}
-
-	if (verify_accountname(name) == 0) {
-		return 102;
-	}
-
-	if (strlen(memo) > 254) {
-		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;
-	}
-
-	ladmin_log("Request to login-server to change a memo.\n");
-
-	WFIFOW(login_fd,0) = 0x7942;
-	memcpy(WFIFOP(login_fd,2), name, 24);
-	WFIFOW(login_fd,26) = strlen(memo);
-	if (strlen(memo) > 0)
-		memcpy(WFIFOP(login_fd,28), memo, strlen(memo));
-	WFIFOSET(login_fd,28+strlen(memo));
-	bytes_to_read = 1;
-
-	return 0;
-}
-
-//-----------------------------------------------
-// Sub-function: Asking to obtain an account name
-//-----------------------------------------------
-int nameaccount(int id)
-{
-	WFIFOHEAD(login_fd,6);
-	if (id < 0) {
-		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;
-	}
-
-	ladmin_log("Request to login-server to know an account name.\n");
-
-	WFIFOW(login_fd,0) = 0x7946;
-	WFIFOL(login_fd,2) = id;
-	WFIFOSET(login_fd,6);
-	bytes_to_read = 1;
-
-	return 0;
-}
-
-//------------------------------------------
-// Sub-function: Asking to modify a password
-// (Note: never send back a password with login-server!! security of passwords)
-//------------------------------------------
-int changepasswd(char* param)
-{
-	char name[1023], password[1023];
-	WFIFOHEAD(login_fd,50);
-
-	memset(name, '\0', sizeof(name));
-	memset(password, '\0', sizeof(password));
-
-	if (sscanf(param, "\"%[^\"]\" %[^\r\n]", name, password) < 1 &&
-	    sscanf(param, "'%[^']' %[^\r\n]", name, password) < 1 &&
-	    sscanf(param, "%s %[^\r\n]", name, password) < 1) {
-		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;
-	}
-
-	if (verify_accountname(name) == 0) {
-		return 102;
-	}
-
-	if (strlen(password) == 0) {
-		if (typepasswd(password) == 0)
-			return 134;
-	}
-	if (verify_password(password) == 0)
-		return 131;
-
-	ladmin_log("Request to login-server to change a password.\n");
-
-	WFIFOW(login_fd,0) = 0x7934;
-	memcpy(WFIFOP(login_fd,2), name, 24);
-	memcpy(WFIFOP(login_fd,26), password, 24);
-	WFIFOSET(login_fd,50);
-	bytes_to_read = 1;
-
-	return 0;
-}
-
-//----------------------------------------------------------------------
-// Sub-function: Request to login-server to reload GM configuration file
-// this function have no answer
-//----------------------------------------------------------------------
-int reloadGM(void)
-{
-	WFIFOHEAD(login_fd,2);
-	WFIFOW(login_fd,0) = 0x7955;
-	WFIFOSET(login_fd,2);
-	bytes_to_read = 0;
-
-	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;
-}
-
-//-----------------------------------------------------
-// Sub-function: Asking to modify the sex of an account
-//-----------------------------------------------------
-int changesex(char* param)
-{
-	char name[1023], sex[1023];
-	WFIFOHEAD(login_fd,27);
-
-	memset(name, '\0', sizeof(name));
-	memset(sex, '\0', sizeof(sex));
-
-	if (sscanf(param, "\"%[^\"]\" %[^\r\n]", name, sex) < 2 &&
-	    sscanf(param, "'%[^']' %[^\r\n]", name, sex) < 2 &&
-	    sscanf(param, "%s %[^\r\n]", name, sex) < 2) {
-		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;
-	}
-
-	if (verify_accountname(name) == 0) {
-		return 102;
-	}
-
-	sex[0] = TOUPPER(sex[0]);
-	if (strchr("MF", sex[0]) == NULL) {
-		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;
-	}
-
-	ladmin_log("Request to login-server to change a sex.\n");
-
-	WFIFOW(login_fd,0) = 0x793c;
-	memcpy(WFIFOP(login_fd,2), name, 24);
-	WFIFOB(login_fd,26) = sex[0];
-	WFIFOSET(login_fd,27);
-	bytes_to_read = 1;
-
-	return 0;
-}
-
-//-------------------------------------------------------------------------
-// Sub-function of sub-function changestate, blockaccount or unblockaccount
-// Asking to modify the state of an account
-//-------------------------------------------------------------------------
-int changestatesub(char* name, int state, char* error_message7)
-{
-	char error_message[1023]; // need to use, because we can modify error_message7
-	WFIFOHEAD(login_fd,50);
-
-	memset(error_message, '\0', sizeof(error_message));
-	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
-		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");
-		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;
-	}
-
-	if (verify_accountname(name) == 0) {
-		return 102;
-	}
-
-	if (state != 7) {
-		strcpy(error_message, "-");
-	} else {
-		if (strlen(error_message) < 1) {
-			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) {
-			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;
-		}
-	}
-
-	ladmin_log("Request to login-server to change a state.\n");
-
-	WFIFOW(login_fd,0) = 0x7936;
-	memcpy(WFIFOP(login_fd,2), name, 24);
-	WFIFOL(login_fd,26) = state;
-	memcpy(WFIFOP(login_fd,30), error_message, 20);
-	WFIFOSET(login_fd,50);
-	bytes_to_read = 1;
-
-	return 0;
-}
-
-//-------------------------------------------------------
-// Sub-function: Asking to modify the state of an account
-//-------------------------------------------------------
-int changestate(char* param)
-{
-	char name[1023], error_message[1023];
-	int state;
-
-	memset(name, '\0', sizeof(name));
-	memset(error_message, '\0', sizeof(error_message));
-
-	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) {
-		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;
-	}
-
-	return changestatesub(name, state, error_message);
-}
-
-//-------------------------------------------
-// Sub-function: Asking to unblock an account
-//-------------------------------------------
-int unblockaccount(char* param)
-{
-	char name[1023];
-
-	memset(name, '\0', sizeof(name));
-
-	if (strlen(param) == 0 ||
-	    (sscanf(param, "\"%[^\"]\"", name) < 1 &&
-	     sscanf(param, "'%[^']'", name) < 1 &&
-	     sscanf(param, "%[^\r\n]", name) < 1) ||
-	     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;
-	}
-
-	return changestatesub(name, 0, "-"); // state 0, no error message
-}
-
-//-------------------------------------------
-// Sub-function: Asking to unblock an account
-//-------------------------------------------
-int blockaccount(char* param)
-{
-	char name[1023];
-
-	memset(name, '\0', sizeof(name));
-
-	if (strlen(param) == 0 ||
-	    (sscanf(param, "\"%[^\"]\"", name) < 1 &&
-	     sscanf(param, "'%[^']'", name) < 1 &&
-	     sscanf(param, "%[^\r\n]", name) < 1) ||
-	     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;
-	}
-
-	return changestatesub(name, 5, "-"); // state 5, no error message
-}
-
-//---------------------------------------------------------------------
-// Sub-function: Add/substract time to the validity limit of an account
-//---------------------------------------------------------------------
-int timeaddaccount(char* param)
-{
-	char name[1023], modif[1023];
-	int year, month, day, hour, minute, second;
-	char * p_modif;
-	int value, i;
-	WFIFOHEAD(login_fd,38);
-
-	memset(name, '\0', sizeof(name));
-	memset(modif, '\0', sizeof(modif));
-	year = month = day = hour = minute = second = 0;
-
-	if (sscanf(param, "\"%[^\"]\" %[^\r\n]", name, modif) < 2 &&
-	    sscanf(param, "'%[^']' %[^\r\n]", name, modif) < 2 &&
-	    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) {
-		return 102;
-	}
-
-	// lowercase for modif
-	for (i = 0; modif[i]; i++)
-		modif[i] = TOLOWER(modif[i]);
-	p_modif = modif;
-	while (strlen(p_modif) > 0) {
-		value = atoi(p_modif);
-		if (value == 0) {
-			p_modif++;
-		} else {
-			if (p_modif[0] == '-' || p_modif[0] == '+')
-				p_modif++;
-			while (strlen(p_modif) > 0 && p_modif[0] >= '0' && p_modif[0] <= '9') {
-				p_modif++;
-			}
-			if (p_modif[0] == 's') {
-				second = value;
-				p_modif++;
-			} else if (p_modif[0] == 'm' && p_modif[1] == 'n') {
-				minute = value;
-				p_modif += 2;
-			} else if (p_modif[0] == 'h') {
-				hour = value;
-				p_modif++;
-			} else if (p_modif[0] == 'd' || p_modif[0] == 'j') {
-				day = value;
-				p_modif += 2;
-			} else if (p_modif[0] == 'm') {
-				month = value;
-				p_modif++;
-			} else if (p_modif[0] == 'y' || p_modif[0] == 'a') {
-				year = value;
-				p_modif++;
-			} else {
-				p_modif++;
-			}
-		}
-	}
-
-	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) {
-		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) {
-		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) {
-		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) {
-		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) {
-		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) {
-		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) {
-		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;
-	}
-
-	ladmin_log("Request to login-server to modify a time limit.\n");
-
-	WFIFOW(login_fd,0) = 0x7950;
-	memcpy(WFIFOP(login_fd,2), name, 24);
-	WFIFOW(login_fd,26) = (short)year;
-	WFIFOW(login_fd,28) = (short)month;
-	WFIFOW(login_fd,30) = (short)day;
-	WFIFOW(login_fd,32) = (short)hour;
-	WFIFOW(login_fd,34) = (short)minute;
-	WFIFOW(login_fd,36) = (short)second;
-	WFIFOSET(login_fd,38);
-	bytes_to_read = 1;
-
-	return 0;
-}
-
-//-------------------------------------------------
-// Sub-function: Set a validity limit of an account
-//-------------------------------------------------
-int timesetaccount(char* param)
-{
-	char name[1023], date[1023], time[1023];
-	int year, month, day, hour, minute, second;
-	time_t expiration_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited)
-	struct tm *tmtime;
-	WFIFOHEAD(login_fd,30);
-
-	memset(name, '\0', sizeof(name));
-	memset(date, '\0', sizeof(date));
-	memset(time, '\0', sizeof(time));
-	year = month = day = hour = minute = second = 0;
-	expiration_time = 0;
-	tmtime = localtime(&expiration_time); // initialize
-
-	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
-		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) {
-		return 102;
-	}
-
-	if (time[0] == '\0')
-		strcpy(time, "23:59:59");
-
-	if (atoi(date) != 0 &&
-	    ((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(date, "%d'%d'%d", &year, &month, &day) < 3) ||
-	     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;
-	}
-
-	if (atoi(date) == 0) {
-		expiration_time = 0;
-	} else {
-		if (year < 70) {
-			year = year + 100;
-		}
-		if (year >= 1900) {
-			year = year - 1900;
-		}
-		if (month < 1 || month > 12) {
-			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) {
-			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)) {
-			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) {
-			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) {
-			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) {
-			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;
-		tmtime->tm_mon = month;
-		tmtime->tm_mday = day;
-		tmtime->tm_hour = hour;
-		tmtime->tm_min = minute;
-		tmtime->tm_sec = second;
-		tmtime->tm_isdst = -1; // -1: no winter/summer time modification
-		expiration_time = mktime(tmtime);
-		if (expiration_time == -1) {
-			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;
-		}
-	}
-
-	ladmin_log("Request to login-server to set a time limit.\n");
-
-	WFIFOW(login_fd,0) = 0x7948;
-	memcpy(WFIFOP(login_fd,2), name, 24);
-	WFIFOL(login_fd,26) = (int)expiration_time;
-	WFIFOSET(login_fd,30);
-	bytes_to_read = 1;
-
-	return 0;
-}
-
-//------------------------------------------------------------------------------
-// Sub-function: Asking to displaying information about an account (by its name)
-//------------------------------------------------------------------------------
-int whoaccount(char* param)
-{
-	char name[1023];
-	WFIFOHEAD(login_fd,26);
-
-	memset(name, '\0', sizeof(name));
-
-	if (strlen(param) == 0 ||
-	    (sscanf(param, "\"%[^\"]\"", name) < 1 &&
-	     sscanf(param, "'%[^']'", name) < 1 &&
-	     sscanf(param, "%[^\r\n]", name) < 1) ||
-	     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;
-	}
-
-	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);
-	WFIFOSET(login_fd,26);
-	bytes_to_read = 1;
-
-	return 0;
-}
-
-//--------------------------------------------------------
-// Sub-function: Asking of the version of the login-server
-//--------------------------------------------------------
-int checkloginversion(void)
-{
-	WFIFOHEAD(login_fd,2);
-	ladmin_log("Request to login-server to obtain its version.\n");
-
-	WFIFOW(login_fd,0) = 0x7530;
-	WFIFOSET(login_fd,2);
-	bytes_to_read = 1;
-
-	return 0;
-}
-
-//---------------------------------------------
-// Prompt function
-// this function wait until user type a command
-// and analyse the command.
-//---------------------------------------------
-int prompt(void)
-{
-	int i, j;
-	char buf[1024];
-	char *p;
-
-	// while we don't wait new packets
-	while (bytes_to_read == 0) {
-		// for help with the console colors look here:
-		// http://www.edoceo.com/liberum/?doc=printf-with-color
-		// some code explanation (used here):
-		// \033[2J : clear screen and go up/left (0, 0 position)
-		// \033[K  : clear line from actual position to end of the line
-		// \033[0m : reset color parameter
-		// \033[1m : use bold for font
-		ShowMessage("\n");
-		ShowMessage("\033[32mTo list the commands, type 'enter'.\033[0m\n");
-		ShowMessage("\033[0;36mLadmin-> \033[0m");
-		ShowMessage("\033[1m");
-		fflush(stdout);
-
-		// get command and parameter
-		memset(buf, '\0', sizeof(buf));
-		fflush(stdin);
-		fgets(buf, sizeof(buf), stdin);
-
-		ShowMessage("\033[0m");
-		fflush(stdout);
-
-		// remove final \n
-		if((p = strrchr(buf, '\n')) != NULL)
-			p[0] = '\0';
-		// remove all control char
-		for (i = 0; buf[i]; i++)
-			if (buf[i] < 32) {
-				// remove cursor control.
-				if (buf[i] == 27 && buf[i+1] == '[' &&
-				    (buf[i+2] == 'H' || // home position (cursor)
-				     buf[i+2] == 'J' || // clear screen
-				     buf[i+2] == 'A' || // up 1 line
-				     buf[i+2] == 'B' || // down 1 line
-				     buf[i+2] == 'C' || // right 1 position
-				     buf[i+2] == 'D' || // left 1 position
-				     buf[i+2] == 'G')) { // center cursor (windows)
-					for (j = i; buf[j]; j++)
-						buf[j] = buf[j+3];
-				} else if (buf[i] == 27 && buf[i+1] == '[' && buf[i+2] == '2' && buf[i+3] == 'J') { // clear screen
-					for (j = i; buf[j]; j++)
-						buf[j] = buf[j+4];
-				} else if (buf[i] == 27 && buf[i+1] == '[' && buf[i+3] == '~' &&
-				           (buf[i+2] == '1' || // home (windows)
-				            buf[i+2] == '2' || // insert (windows)
-				            buf[i+2] == '3' || // del (windows)
-				            buf[i+2] == '4' || // end (windows)
-				            buf[i+2] == '5' || // pgup (windows)
-				            buf[i+2] == '6')) { // pgdown (windows)
-					for (j = i; buf[j]; j++)
-						buf[j] = buf[j+4];
-				} else {
-					// remove other control char.
-					for (j = i; buf[j]; j++)
-						buf[j] = buf[j+1];
-				}
-				i--;
-			}
-
-		// extract command name and parameters
-		memset(command, '\0', sizeof(command));
-		memset(parameters, '\0', sizeof(parameters));
-		sscanf(buf, "%1023s %[^\n]", command, parameters);
-		command[1023] = '\0';
-		parameters[1023] = '\0';
-
-		// lowercase for command line
-		for (i = 0; command[i]; i++)
-			command[i] = TOLOWER(command[i]);
-
-		if (command[0] == '?' || strlen(command) == 0) {
-			strcpy(buf, "help");
-			strcpy(command, "help");
-		}
-
-		// Analyse of the command
-		check_command(command); // give complete name to the command
-
-		if (strlen(parameters) == 0) {
-			ladmin_log("Command: '%s' (without parameters)\n", command, parameters);
-		} else {
-			ladmin_log("Command: '%s', parameters: '%s'\n", command, parameters);
-		}
-
-		// Analyse of the command
-// help
-		if (strcmp(command, "help") == 0 ) {
-			display_help(parameters);
-// general commands
-		} else if (strcmp(command, "add") == 0) {
-			addaccount(parameters, 0); // 0: no email
-		} else if (strcmp(command, "ban") == 0) {
-			banaccount(parameters);
-		} else if (strcmp(command, "banadd") == 0) {
-			banaddaccount(parameters);
-		} else if (strcmp(command, "banset") == 0) {
-			bansetaccount(parameters);
-		} else if (strcmp(command, "block") == 0) {
-			blockaccount(parameters);
-		} else if (strcmp(command, "check") == 0) {
-			checkaccount(parameters);
-		} else if (strcmp(command, "create") == 0) {
-			addaccount(parameters, 1); // 1: with email
-		} else if (strcmp(command, "delete") == 0) {
-			delaccount(parameters);
-		} else if (strcmp(command, "email") == 0) {
-			changeemail(parameters);
-		} else if (strcmp(command, "getcount") == 0) {
-			getlogincount();
-		} else if (strcmp(command, "gm") == 0) {
-			changegmlevel(parameters);
-		} else if (strcmp(command, "id") == 0) {
-			idaccount(parameters);
-		} else if (strcmp(command, "info") == 0) {
-			infoaccount(atoi(parameters));
-		} else if (strcmp(command, "kami") == 0) {
-			sendbroadcast(0, parameters); // flag for normal
-		} else if (strcmp(command, "kamib") == 0) {
-			sendbroadcast(0x10, parameters); // flag for blue
-		} else if (strcmp(command, "list") == 0) {
-			listaccount(parameters, 0); // 0: to list all
-		} else if (strcmp(command, "listban") == 0) {
-			listaccount(parameters, 3); // 3: to list only accounts with state or bannished
-		} else if (strcmp(command, "listgm") == 0) {
-			listaccount(parameters, 1); // 1: to list only GM
-		} else if (strcmp(command, "listok") == 0) {
-			listaccount(parameters, 4); // 4: to list only accounts without state and not bannished
-		} else if (strcmp(command, "memo") == 0) {
-			changememo(parameters);
-		} else if (strcmp(command, "name") == 0) {
-			nameaccount(atoi(parameters));
-		} else if (strcmp(command, "password") == 0) {
-			changepasswd(parameters);
-		} else if (strcmp(command, "reloadgm") == 0) {
-			reloadGM();
-		} else if (strcmp(command, "search") == 0) { // no regex in C version
-			listaccount(parameters, 2); // 2: to list with pattern
-		} else if (strcmp(command, "sex") == 0) {
-			changesex(parameters);
-		} else if (strcmp(command, "state") == 0) {
-			changestate(parameters);
-		} else if (strcmp(command, "timeadd") == 0) {
-			timeaddaccount(parameters);
-		} else if (strcmp(command, "timeset") == 0) {
-			timesetaccount(parameters);
-		} else if (strcmp(command, "unban") == 0) {
-			unbanaccount(parameters);
-		} else if (strcmp(command, "unblock") == 0) {
-			unblockaccount(parameters);
-		} else if (strcmp(command, "version") == 0) {
-			checkloginversion();
-		} else if (strcmp(command, "who") == 0) {
-			whoaccount(parameters);
-// quit
-		} else if (strcmp(command, "quit") == 0 ||
-		           strcmp(command, "exit") == 0 ||
-		           strcmp(command, "end") == 0) {
-			ShowMessage("Bye.\n");
-			exit(EXIT_SUCCESS);
-// unknown command
-		} else {
-			ShowMessage("Unknown command [%s].\n", buf);
-			ladmin_log("Unknown command [%s].\n", buf);
-		}
-	}
-
-	return 0;
-}
-
-//-------------------------------------------------------------
-// Function: Parse receiving informations from the login-server
-//-------------------------------------------------------------
-int parse_fromlogin(int fd)
-{
-	struct char_session_data *sd;
-	int id;
-	RFIFOHEAD(fd);
-	if (session[fd]->flag.eof) {
-		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);
-	}
-
-//	ShowMessage("parse_fromlogin : %d %d %d\n", fd, RFIFOREST(fd), RFIFOW(fd,0));
-	sd = (struct char_session_data*)session[fd]->session_data;
-
-	while(RFIFOREST(fd) >= 2) {
-		switch(RFIFOW(fd,0)) {
-		case 0x7919:	// answer of a connection request
-			if (RFIFOREST(fd) < 3)
-				return 0;
-			if (RFIFOB(fd,2) != 0) {
-				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 {
-				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();
-			}
-			RFIFOSKIP(fd,3);
-			break;
-
-		case 0x01dc:	// answer of a coding key request
-			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
-				return 0;
-		  {
-			char md5str[64] = "", md5bin[32];
-			WFIFOHEAD(login_fd, 20);
-			if (passenc == 1) {
-				strncpy(md5str, (const char*)RFIFOP(fd,4), RFIFOW(fd,2) - 4);
-				strcat(md5str, loginserveradminpassword);
-			} else if (passenc == 2) {
-				strncpy(md5str, loginserveradminpassword, sizeof(loginserveradminpassword));
-				strcat(md5str, (const char*)RFIFOP(fd,4));
-			}
-			MD5_Binary(md5str, md5bin);
-			WFIFOW(login_fd,0) = 0x7918; // Request for administation login (encrypted password)
-			WFIFOW(login_fd,2) = passenc; // Encrypted type
-			memcpy(WFIFOP(login_fd,4), md5bin, 16);
-			WFIFOSET(login_fd,20);
-			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));
-			break;
-
-		case 0x7531:	// Displaying of the version of the login-server
-			if (RFIFOREST(fd) < 10)
-				return 0;
-			ShowMessage("  Login-Server [%s:%d]\n", loginserverip, loginserverport);
-			if (((int)RFIFOB(login_fd,5)) == 0) {
-				ShowMessage("  eAthena version stable-%d.%d", (int)RFIFOB(login_fd,2), (int)RFIFOB(login_fd,3));
-			} else {
-				ShowMessage("  eAthena version dev-%d.%d", (int)RFIFOB(login_fd,2), (int)RFIFOB(login_fd,3));
-			}
-			if (((int)RFIFOB(login_fd,4)) == 0)
-				ShowMessage(" revision %d", (int)RFIFOB(login_fd,4));
-			if (((int)RFIFOB(login_fd,6)) == 0)
-				ShowMessage("%d.\n", RFIFOW(login_fd,8));
-			else
-				ShowMessage("-mod%d.\n", RFIFOW(login_fd,8));
-			bytes_to_read = 0;
-			RFIFOSKIP(fd,10);
-			break;
-
-		case 0x7921:	// Displaying of the list of accounts
-			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
-				return 0;
-			if (RFIFOW(fd,2) < 5) {
-				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);
-				ladmin_log("  Receiving of a accounts list.\n");
-				for(i = 4; i < RFIFOW(fd,2); i += 38) {
-					int j;
-					char userid[24];
-					char lower_userid[24];
-					memcpy(userid, RFIFOP(fd,i + 5), sizeof(userid));
-					userid[sizeof(userid)-1] = '\0';
-					memset(lower_userid, '\0', sizeof(lower_userid));
-					for (j = 0; userid[j]; j++)
-						lower_userid[j] = TOLOWER(userid[j]);
-					list_first = RFIFOL(fd,i) + 1;
-					// here are checks...
-					if (list_type == 0 ||
-					    (list_type == 1 && RFIFOB(fd,i+4) > 0) ||
-					    (list_type == 2 && strstr(lower_userid, parameters) != NULL) ||
-					    (list_type == 3 && RFIFOL(fd,i+34) != 0) ||
-					    (list_type == 4 && RFIFOL(fd,i+34) == 0)) {
-						ShowMessage("%10d ", (int)RFIFOL(fd,i));
-						if (RFIFOB(fd,i+4) == 0)
-							ShowMessage("   ");
-						else
-							ShowMessage("%2d ", (int)RFIFOB(fd,i+4));
-						ShowMessage("%-24s", userid);
-						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:
-							ShowMessage("%-27s\n", "Account OK");
-							break;
-						case 1:
-							ShowMessage("%-27s\n", "Unregistered ID");
-							break;
-						case 2:
-							ShowMessage("%-27s\n", "Incorrect Password");
-							break;
-						case 3:
-							ShowMessage("%-27s\n", "This ID is expired");
-							break;
-						case 4:
-							ShowMessage("%-27s\n", "Rejected from Server");
-							break;
-						case 5:
-							ShowMessage("%-27s\n", "Blocked by the GM Team"); // You have been blocked by the GM Team
-							break;
-						case 6:
-							ShowMessage("%-27s\n", "Your EXE file is too old"); // Your Game's EXE file is not the latest version
-							break;
-						case 7:
-							ShowMessage("%-27s\n", "Banishement or");
-							ShowMessage("                                                   Prohibited to login until...\n"); // You are Prohibited to log in until %s
-							break;
-						case 8:
-							ShowMessage("%-27s\n", "Server is over populated");
-							break;
-						case 9:
-							ShowMessage("%-27s\n", "No MSG");
-							break;
-						default: // 100
-							ShowMessage("%-27s\n", "This ID is totally erased"); // This ID has been totally erased
-							break;
-						}
-						list_count++;
-					}
-				}
-				// asking of the following acounts
-				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;
-				WFIFOSET(login_fd,10);
-				bytes_to_read = 1;
-			}
-			RFIFOSKIP(fd,RFIFOW(fd,2));
-			break;
-
-		case 0x7931:	// Answer of login-server about an account creation
-			if (RFIFOREST(fd) < 30)
-				return 0;
-			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 {
-				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);
-			break;
-
-		case 0x7933:	// Answer of login-server about an account deletion
-			if (RFIFOREST(fd) < 30)
-				return 0;
-			if (RFIFOL(fd,2) == -1) {
-				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 {
-				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);
-			break;
-
-		case 0x7935:	// answer of the change of an account password
-			if (RFIFOREST(fd) < 30)
-				return 0;
-			if (RFIFOL(fd,2) == -1) {
-				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 {
-				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);
-			break;
-
-		case 0x7937:	// answer of the change of an account state
-			if (RFIFOREST(fd) < 34)
-				return 0;
-			if (RFIFOL(fd,2) == -1) {
-				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];
-				sprintf(tmpstr, "Account [%s] state successfully changed in [", RFIFOP(fd,6));
-				switch(RFIFOL(fd,30)) {
-				case 0:
-					strcat(tmpstr, "0: Account OK");
-				case 1:
-					strcat(tmpstr, "1: Unregistered ID");
-					break;
-				case 2:
-					strcat(tmpstr, "2: Incorrect Password");
-					break;
-				case 3:
-					strcat(tmpstr, "3: This ID is expired");
-					break;
-				case 4:
-					strcat(tmpstr, "4: Rejected from Server");
-					break;
-				case 5:
-					strcat(tmpstr, "5: You have been blocked by the GM Team");
-					break;
-				case 6:
-					strcat(tmpstr, "6: [Your Game's EXE file is not the latest version");
-					break;
-				case 7:
-					strcat(tmpstr, "7: You are Prohibited to log in until...");
-					break;
-				case 8:
-					strcat(tmpstr, "8: Server is jammed due to over populated");
-					break;
-				case 9:
-					strcat(tmpstr, "9: No MSG");
-					break;
-				default: // 100
-					strcat(tmpstr, "100: This ID is totally erased");
-					break;
-				}
-				strcat(tmpstr, "]");
-				ShowMessage("%s\n", tmpstr);
-				ladmin_log("%s\n", tmpstr);
-			}
-			bytes_to_read = 0;
-			RFIFOSKIP(fd,34);
-			break;
-
-		case 0x7939:	// answer of the number of online players
-			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
-				return 0;
-		  {
-			// Get length of the received packet
-			int i;
-			char name[20];
-			ladmin_log("  Receiving of the number of online players.\n");
-			// Read information of the servers
-			if (RFIFOW(fd,2) < 5) {
-				ShowMessage("  No server is connected to the login-server.\n");
-			} else {
-				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));
-					name[sizeof(name) - 1] = '\0';
-					ShowMessage("    %-20s : %5d\n", name, RFIFOW(fd,i+26));
-				}
-			}
-		  }
-			bytes_to_read = 0;
-			RFIFOSKIP(fd,RFIFOW(fd,2));
-			break;
-
-		case 0x793b:	// answer of the check of a password
-			if (RFIFOREST(fd) < 30)
-				return 0;
-			id = RFIFOL(fd,2);
-			if (id == -1) {
-				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 {
-				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);
-			break;
-
-		case 0x793d:	// answer of the change of an account sex
-			if (RFIFOREST(fd) < 30)
-				return 0;
-			id = RFIFOL(fd,2);
-			if (id == -1) {
-				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 {
-				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);
-			break;
-
-		case 0x793f:	// answer of the change of an account GM level
-			if (RFIFOREST(fd) < 30)
-				return 0;
-			id = RFIFOL(fd,2);
-			if (id == -1) {
-				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 {
-				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);
-			break;
-
-		case 0x7941:	// answer of the change of an account email
-			if (RFIFOREST(fd) < 30)
-				return 0;
-			id = RFIFOL(fd,2);
-			if (id == -1) {
-				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 {
-				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);
-			break;
-
-		case 0x7943:	// answer of the change of an account memo
-			if (RFIFOREST(fd) < 30)
-				return 0;
-			id = RFIFOL(fd,2);
-			if (id == -1) {
-				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 {
-				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);
-			break;
-
-		case 0x7945:	// answer of an account id search
-			if (RFIFOREST(fd) < 30)
-				return 0;
-			id = RFIFOL(fd,2);
-			if (id == -1) {
-				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 {
-				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);
-			break;
-
-		case 0x7947:	// answer of an account name search
-			if (RFIFOREST(fd) < 30)
-				return 0;
-			id = RFIFOL(fd,2);
-			if (strcmp((const char*)RFIFOP(fd,6), "") == 0) {
-				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 {
-				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);
-			break;
-
-		case 0x7949:	// answer of an account validity limit set
-			if (RFIFOREST(fd) < 34)
-				return 0;
-			id = RFIFOL(fd,2);
-			if (id == -1) {
-				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) {
-					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));
-					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;
-			RFIFOSKIP(fd,34);
-			break;
-
-		case 0x794b:	// answer of an account ban set
-			if (RFIFOREST(fd) < 34)
-				return 0;
-			id = RFIFOL(fd,2);
-			if (id == -1) {
-				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) {
-					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));
-					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;
-			RFIFOSKIP(fd,34);
-			break;
-
-		case 0x794d:	// answer of an account ban date/time changing
-			if (RFIFOREST(fd) < 34)
-				return 0;
-			id = RFIFOL(fd,2);
-			if (id == -1) {
-				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) {
-					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));
-					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;
-			RFIFOSKIP(fd,34);
-			break;
-
-		case 0x794f:	// answer of a broadcast
-			if (RFIFOREST(fd) < 4)
-				return 0;
-			if (RFIFOW(fd,2) == (unsigned short)-1) {
-				ShowMessage("Message sending failed. No online char-server.\n");
-				ladmin_log("Message sending failed. No online char-server.\n");
-			} else {
-				ShowMessage("Message successfully sended to login-server.\n");
-				ladmin_log("Message successfully sended to login-server.\n");
-			}
-			bytes_to_read = 0;
-			RFIFOSKIP(fd,4);
-			break;
-
-		case 0x7951:	// answer of an account validity limit changing
-			if (RFIFOREST(fd) < 34)
-				return 0;
-			id = RFIFOL(fd,2);
-			if (id == -1) {
-				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) {
-					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));
-					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;
-			RFIFOSKIP(fd,34);
-			break;
-
-		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)
-			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));
-			safestrncpy(memo, (const char*)RFIFOP(fd,150), RFIFOW(fd,148));
-			id = RFIFOL(fd,2);
-			if (id == -1) {
-				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) {
-				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 {
-				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 {
-					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: 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 (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);
-				}
-				ShowMessage(" Memo:   '%s'\n", memo);
-			}
-		  }
-			bytes_to_read = 0;
-			RFIFOSKIP(fd,150 + RFIFOW(fd,148));
-			break;
-
-		default:
-			ShowMessage("Remote administration has been disconnected (unknown packet).\n");
-			ladmin_log("'End of connection, unknown packet.\n");
-			set_eof(fd);
-			return 0;
-		}
-	}
-
-	// if we don't wait new packets, do the prompt
-	prompt();
-
-	return 0;
-}
-
-//------------------------------------
-// Function to connect to login-server
-//------------------------------------
-int Connect_login_server(void)
-{
-	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)
-	{	//Might not be the most elegant way to handle this, but I've never used ladmin so I dunno what else you could do. [Skotlex]
-		ShowMessage("Error: Failed to connect to Login Server\n");
-		exit(EXIT_FAILURE);
-	}
-	session[login_fd]->flag.server = 1;
-	if (passenc == 0) {
-		WFIFOHEAD(login_fd,28);
-		WFIFOW(login_fd,0) = 0x7918; // Request for administation login
-		WFIFOW(login_fd,2) = 0; // no encrypted
-		memcpy(WFIFOP(login_fd,4), loginserveradminpassword, 24);
-		WFIFOSET(login_fd,28);
-		bytes_to_read = 1;
-		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;
-		ShowMessage("Request about the MD5 key...\n");
-		ladmin_log("Request about the MD5 key...\n");
-	}
-
-	return 0;
-}
-
-// sends a ping packet to login server (will receive pong 0x2718)
-int ping_login_server(int tid, unsigned int tick, int id, intptr data)
-{
-	if (login_fd > 0 && session[login_fd] != NULL)
-	{
-		WFIFOHEAD(login_fd,2);
-		WFIFOW(login_fd,0) = 0x2719;
-		WFIFOSET(login_fd,2);
-	}
-	return 0;
-}
-
-//-----------------------------------
-// Reading general configuration file
-//-----------------------------------
-int ladmin_config_read(const char *cfgName)
-{
-	char line[1024], w1[1024], w2[1024];
-	FILE *fp;
-
-	fp = fopen(cfgName, "r");
-	if (fp == NULL) {
-		ShowMessage("\033[0mConfiguration file (%s) not found.\n", cfgName);
-		return 1;
-	}
-
-	ShowMessage("\033[0m---Start reading of Ladmin 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) {
-			remove_control_chars(w1);
-			remove_control_chars(w2);
-
-			if(strcmpi(w1,"login_ip")==0) {
-				uint32 ipl = host2ip(w2);
-				if (ipl != 0) {
-					ip2str(ipl, loginserverip);
-					ShowMessage("Login server IP address: %s -> %s\n", w2, loginserverip);
-				} else
-					memcpy(loginserverip, w2, 16);
-			} else if (strcmpi(w1, "login_port") == 0) {
-				loginserverport = atoi(w2);
-			} else if (strcmpi(w1, "admin_pass") == 0) {
-				strncpy(loginserveradminpassword, w2, sizeof(loginserveradminpassword));
-				loginserveradminpassword[sizeof(loginserveradminpassword)-1] = '\0';
-			} else if (strcmpi(w1, "passenc") == 0) {
-				passenc = atoi(w2);
-				if (passenc < 0 || passenc > 2)
-					passenc = 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';
-			} else if (strcmpi(w1, "date_format") == 0) {
-				strncpy(date_format, w2, sizeof(date_format));
-			} else if(strcmpi(w1,"stdout_with_ansisequence") == 0) {
-				stdout_with_ansisequence = config_switch(w2);
-			} else if (strcmpi(w1, "import") == 0) {
-				ladmin_config_read(w2);
-			}
-		}
-	}
-	fclose(fp);
-
-	login_ip = str2ip(loginserverip);
-
-	ShowMessage("---End reading of Ladmin configuration file.\n");
-
-	return 0;
-}
-
-//------------------------------
-// Function called when the server
-// has received a crash signal.
-//------------------------------
-void do_abort(void)
-{
-}
-
-//--------------------------------------
-// Function called at exit of the server
-//--------------------------------------
-void do_final(void)
-{
-	if (already_exit_function == 0) {
-
-		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);
-	}
-}
-
-//------------------------
-// Main function of ladmin
-//------------------------
-int do_init(int argc, char **argv)
-{
-	int next;
-	socket_init();
-
-	// read ladmin configuration
-	ladmin_config_read((argc > 1) ? argv[1] : LADMIN_CONF_NAME);
-
-	ladmin_log("");
-	ladmin_log("Configuration file readed.\n");
-
-	srand(time(NULL));
-
-	set_defaultparse(parse_fromlogin);
-
-	ShowMessage("EAthena login-server administration tool.\n");
-	ShowMessage("(for eAthena version %d.%d.%d.)\n", ATHENA_MAJOR_VERSION, ATHENA_MINOR_VERSION, ATHENA_REVISION);
-
-	ladmin_log("Ladmin is ready.\n");
-	ShowMessage("Ladmin is \033[1;32mready\033[0m.\n\n");
-
-	Connect_login_server();
-
-	// keep the char-login connection alive
-	add_timer_func_list(ping_login_server, "ping_login_server");
-	add_timer_interval(gettick() + 1000, ping_login_server, 0, 0, ((int)stall_time-2) * 1000);
-
-	// minimalist core doesn't have sockets parsing,
-	// so we have to do this ourselves
-	while (runflag) {
-		next = do_timer(gettick_nocache());
-		do_sockets(next);
-	}
-
-	return 0;
-}

+ 0 - 9
src/ladmin/ladmin.h

@@ -1,9 +0,0 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
-
-#ifndef _LADMIN_H_
-#define _LADMIN_H_
-
-#define LADMIN_CONF_NAME	"conf/ladmin_athena.conf"
-
-#endif /* _LADMIN_H_ */

+ 1 - 1
src/login/Makefile.in

@@ -13,7 +13,7 @@ COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h
 COMMON_SQL_OBJ = ../common/obj_sql/sql.o
 COMMON_SQL_OBJ = ../common/obj_sql/sql.o
 COMMON_SQL_H = ../common/sql.h
 COMMON_SQL_H = ../common/sql.h
 
 
-LOGIN_OBJ = login.o admin.o
+LOGIN_OBJ = login.o
 LOGIN_TXT_OBJ = $(LOGIN_OBJ:%=obj_txt/%) \
 LOGIN_TXT_OBJ = $(LOGIN_OBJ:%=obj_txt/%) \
 	obj_txt/account_txt.o obj_txt/ipban_txt.o obj_txt/loginlog_txt.o
 	obj_txt/account_txt.o obj_txt/ipban_txt.o obj_txt/loginlog_txt.o
 LOGIN_SQL_OBJ = $(LOGIN_OBJ:%=obj_sql/%) \
 LOGIN_SQL_OBJ = $(LOGIN_OBJ:%=obj_sql/%) \

+ 0 - 857
src/login/admin.c

@@ -1,857 +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/lock.h"
-#include "account.h"
-#include "login.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h> // for stat/lstat/fstat
-
-extern AccountDB* accounts;
-
-int charif_sendallwos(int sfd, unsigned char *buf, unsigned int len);
-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)
-{
-	char* account_name;
-
-	uint32 ipl = session[fd]->client_addr;
-	char ip[16];
-	ip2str(ipl, ip);
-
-	if( session[fd]->flag.eof )
-	{
-		do_close(fd);
-		ShowInfo("Remote administration has disconnected (session #%d).\n", fd);
-		return 0;
-	}
-
-	while( RFIFOREST(fd) >= 2 )
-	{
-		uint16 command = RFIFOW(fd,0);
-
-		switch( command )
-		{
-		
-		case 0x7530:	// Request of the server version
-			ShowStatus("'ladmin': Sending of the server version (ip: %s)\n", ip);
-			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);
-			RFIFOSKIP(fd,2);
-			break;
-/*
-		case 0x7920:	// Request of an accounts list
-			if (RFIFOREST(fd) < 10)
-				return 0;
-			{
-				int st, ed;
-				uint16 len;
-				CREATE_BUFFER(id, int, auth_num);
-				st = RFIFOL(fd,2);
-				ed = RFIFOL(fd,6);
-				RFIFOSKIP(fd,10);
-				WFIFOW(fd,0) = 0x7921;
-				if (st < 0)
-					st = 0;
-				if (ed > END_ACCOUNT_NUM || ed < st || ed <= 0)
-					ed = END_ACCOUNT_NUM;
-				ShowStatus("'ladmin': Sending an accounts list (ask: from %d to %d, ip: %s)\n", st, ed, ip);
-				// Sort before send
-				for(i = 0; i < auth_num; i++) {
-					unsigned int k;
-					id[i] = i;
-					for(j = 0; j < i; j++) {
-						if (auth_dat[id[i]].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;
-						}
-					}
-				}
-				// Sending accounts information
-				len = 4;
-				for(i = 0; i < auth_num && len < 30000; i++) {
-					int account_id = auth_dat[id[i]].account_id; // use sorted index
-					if (account_id >= st && account_id <= ed) {
-						j = id[i];
-						WFIFOL(fd,len) = account_id;
-						WFIFOB(fd,len+4) = (unsigned char)isGM(account_id);
-						memcpy(WFIFOP(fd,len+5), auth_dat[j].userid, 24);
-						WFIFOB(fd,len+29) = auth_dat[j].sex;
-						WFIFOL(fd,len+30) = auth_dat[j].logincount;
-						if (auth_dat[j].state == 0 && auth_dat[j].unban_time != 0) // if no state and banished
-							WFIFOL(fd,len+34) = 7; // 6 = Your are Prohibited to log in until %s
-						else
-							WFIFOL(fd,len+34) = auth_dat[j].state;
-						len += 38;
-					}
-				}
-				WFIFOW(fd,2) = len;
-				WFIFOSET(fd,len);
-				//if (id) free(id);
-				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), 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;
-		{
-			struct mmo_account acc;
-
-			char* account_name = (char*)RFIFOP(fd,2);
-			account_name[23] = '\0';
-
-			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) = acc.account_id;
-				charif_sendallwos(-1, buf, 6);
-
-				// send answer
-				memcpy(WFIFOP(fd,6), acc.userid, 24);
-				WFIFOL(fd,2) = acc.account_id;
-
-				// delete account
-				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;
-		{
-			struct mmo_account acc;
-
-			char* account_name = (char*)RFIFOP(fd,2);
-			account_name[23] = '\0';
-
-			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) )
-			{
-				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);
-					}
-					acc.state = state;
-					accounts->save(accounts, &acc);
-				}
-			}
-			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;
-			ShowStatus("'ladmin': Sending of servers list (ip: %s)\n", ip);
-			for(i = 0; i < MAX_SERVERS; i++) {
-				if (server[i].fd >= 0) {
-					WFIFOL(fd,4+server_num*32) = htonl(server[i].ip);
-					WFIFOW(fd,4+server_num*32+4) = htons(server[i].port);
-					memcpy(WFIFOP(fd,4+server_num*32+6), server[i].name, 20);
-					WFIFOW(fd,4+server_num*32+26) = server[i].users;
-					WFIFOW(fd,4+server_num*32+28) = server[i].maintenance;
-					WFIFOW(fd,4+server_num*32+30) = server[i].new_;
-					server_num++;
-				}
-			}
-			WFIFOW(fd,0) = 0x7939;
-			WFIFOW(fd,2) = 4 + 32 * server_num;
-			WFIFOSET(fd,4+32*server_num);
-			RFIFOSKIP(fd,2);
-			break;
-		}
-
-		case 0x793a:	// Request to password check
-			if (RFIFOREST(fd) < 50)
-				return 0;
-			WFIFOW(fd,0) = 0x793b;
-			WFIFOL(fd,2) = 0xFFFFFFFF; // WTF???
-			account_name = (char*)RFIFOP(fd,2);
-			account_name[23] = '\0';
-			remove_control_chars(account_name);
-			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(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", acc.userid, pass, ip);
-				}
-			} else {
-				memcpy(WFIFOP(fd,6), account_name, 24);
-				ShowNotice("'ladmin': Attempt to check the password of an unknown account (account: %s, ip: %s)\n", account_name, ip);
-			}
-			WFIFOSET(fd,30);
-			RFIFOSKIP(fd,50);
-			break;
-
-		case 0x793c:	// Request to modify sex
-			if (RFIFOREST(fd) < 27)
-				return 0;
-			WFIFOW(fd,0) = 0x793d;
-			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 sex;
-				sex = RFIFOB(fd,26);
-				if (sex != 'F' && sex != 'M') {
-					if (sex > 31)
-						ShowNotice("'ladmin': Attempt to give an invalid sex (account: %s, received sex: %c, ip: %s)\n", account_name, sex, ip);
-					else
-						ShowNotice("'ladmin': Attempt to give an invalid sex (account: %s, received sex: 'control char', ip: %s)\n", account_name, ip);
-				} else {
-					if( accounts->load_str(accounts, &acc, account_name) )
-					{
-						memcpy(WFIFOP(fd,6), acc.userid, 24);
-						if (acc.sex != sex)
-						{
-							unsigned char buf[16];
-							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) = 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", 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);
-					}
-				}
-			}
-			WFIFOSET(fd,30);
-			RFIFOSKIP(fd,27);
-			break;
-
-		case 0x793e:	// Request to modify GM level
-			if (RFIFOREST(fd) < 27)
-				return 0;
-			WFIFOW(fd,0) = 0x793f;
-			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
-			{
-				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;
-
-		case 0x7940:	// Request to modify e-mail
-			if (RFIFOREST(fd) < 66)
-				return 0;
-			WFIFOW(fd,0) = 0x7941;
-			WFIFOL(fd,2) = 0xFFFFFFFF; // WTF???
-			account_name = (char*)RFIFOP(fd,2);
-			account_name[23] = '\0';
-			remove_control_chars(account_name);
-			memcpy(WFIFOP(fd,6), account_name, 24);
-			{
-				char email[40];
-				memcpy(email, RFIFOP(fd,26), 40);
-				if (e_mail_check(email) == 0) {
-					ShowNotice("'ladmin': Attempt to give an invalid e-mail (account: %s, ip: %s)\n", account_name, ip);
-				} else {
-					remove_control_chars(email);
-					i = search_account_index(account_name);
-					if (i != -1) {
-						memcpy(WFIFOP(fd,6), auth_dat[i].userid, 24);
-						memcpy(auth_dat[i].email, email, 40);
-						WFIFOL(fd,2) = auth_dat[i].account_id;
-						ShowNotice("'ladmin': Modification of an email (account: %s, new e-mail: %s, ip: %s)\n", auth_dat[i].userid, email, ip);
-						mmo_auth_sync();
-					} else {
-						ShowNotice("'ladmin': Attempt to modify the e-mail of an unknown account (account: %s, received e-mail: %s, ip: %s)\n", account_name, email, ip);
-					}
-				}
-			}
-			WFIFOSET(fd,30);
-			RFIFOSKIP(fd,66);
-			break;
-
-		case 0x7942:	// Request to modify memo field
-			if ((int)RFIFOREST(fd) < 28 || (int)RFIFOREST(fd) < (28 + RFIFOW(fd,26)))
-				return 0;
-			WFIFOW(fd,0) = 0x7943;
-			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) {
-				int size_of_memo = sizeof(auth_dat[i].memo);
-				memcpy(WFIFOP(fd,6), auth_dat[i].userid, 24);
-				memset(auth_dat[i].memo, '\0', size_of_memo);
-				if (RFIFOW(fd,26) == 0) {
-					strncpy(auth_dat[i].memo, "-", size_of_memo);
-				} else if (RFIFOW(fd,26) > size_of_memo - 1) {
-					memcpy(auth_dat[i].memo, RFIFOP(fd,28), size_of_memo - 1);
-				} else {
-					memcpy(auth_dat[i].memo, RFIFOP(fd,28), RFIFOW(fd,26));
-				}
-				auth_dat[i].memo[size_of_memo - 1] = '\0';
-				remove_control_chars(auth_dat[i].memo);
-				WFIFOL(fd,2) = auth_dat[i].account_id;
-				ShowNotice("'ladmin': Modification of a memo field (account: %s, new memo: %s, ip: %s)\n", auth_dat[i].userid, auth_dat[i].memo, ip);
-				mmo_auth_sync();
-			} else {
-				memcpy(WFIFOP(fd,6), account_name, 24);
-				ShowNotice("'ladmin': Attempt to modify the memo field of an unknown account (account: %s, ip: %s)\n", account_name, ip);
-			}
-			WFIFOSET(fd,30);
-			RFIFOSKIP(fd,28 + RFIFOW(fd,26));
-			break;
-
-		case 0x7944:	// Request to found an account id
-			if (RFIFOREST(fd) < 26)
-				return 0;
-			WFIFOW(fd,0) = 0x7945;
-			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) {
-				memcpy(WFIFOP(fd,6), auth_dat[i].userid, 24);
-				WFIFOL(fd,2) = auth_dat[i].account_id;
-				ShowNotice("'ladmin': Request (by the name) of an account id (account: %s, id: %d, ip: %s)\n", auth_dat[i].userid, auth_dat[i].account_id, ip);
-			} else {
-				memcpy(WFIFOP(fd,6), account_name, 24);
-				ShowNotice("'ladmin': ID request (by the name) of an unknown account (account: %s, ip: %s)\n", account_name, ip);
-			}
-			WFIFOSET(fd,30);
-			RFIFOSKIP(fd,26);
-			break;
-
-		case 0x7946:	// Request to found an account name
-			if (RFIFOREST(fd) < 6)
-				return 0;
-			WFIFOW(fd,0) = 0x7947;
-			WFIFOL(fd,2) = RFIFOL(fd,2);
-			memset(WFIFOP(fd,6), '\0', 24);
-			for(i = 0; i < auth_num; i++) {
-				if (auth_dat[i].account_id == (int)RFIFOL(fd,2)) {
-					strncpy((char*)WFIFOP(fd,6), auth_dat[i].userid, 24);
-					ShowNotice("'ladmin': Request (by id) of an account name (account: %s, id: %d, ip: %s)\n", auth_dat[i].userid, RFIFOL(fd,2), ip);
-					break;
-				}
-			}
-			if (i == auth_num) {
-				ShowNotice("'ladmin': Name request (by id) of an unknown account (id: %d, ip: %s)\n", RFIFOL(fd,2), ip);
-				strncpy((char*)WFIFOP(fd,6), "", 24);
-			}
-			WFIFOSET(fd,30);
-			RFIFOSKIP(fd,6);
-			break;
-
-		case 0x7948:	// Request to change the validity limit (timestamp) (absolute value)
-			if (RFIFOREST(fd) < 30)
-				return 0;
-			{
-				time_t timestamp;
-				char tmpstr[2048];
-				WFIFOW(fd,0) = 0x7949;
-				WFIFOL(fd,2) = 0xFFFFFFFF; // WTF???
-				account_name = (char*)RFIFOP(fd,2);
-				account_name[23] = '\0';
-				remove_control_chars(account_name);
-				timestamp = (time_t)RFIFOL(fd,26);
-				strftime(tmpstr, 24, login_config.date_format, localtime(&timestamp));
-				i = search_account_index(account_name);
-				if (i != -1) {
-					memcpy(WFIFOP(fd,6), auth_dat[i].userid, 24);
-					ShowNotice("'ladmin': Change of a validity limit (account: %s, new validity: %d (%s), ip: %s)\n", auth_dat[i].userid, timestamp, (timestamp == 0 ? "unlimited" : tmpstr), ip);
-					auth_dat[i].expiration_time = timestamp;
-					WFIFOL(fd,2) = auth_dat[i].account_id;
-					mmo_auth_sync();
-				} else {
-					memcpy(WFIFOP(fd,6), account_name, 24);
-					ShowNotice("'ladmin': Attempt to change the validity limit of an unknown account (account: %s, received validity: %d (%s), ip: %s)\n", account_name, timestamp, (timestamp == 0 ? "unlimited" : tmpstr), ip);
-				}
-				WFIFOL(fd,30) = (unsigned int)timestamp;
-			}
-			WFIFOSET(fd,34);
-			RFIFOSKIP(fd,30);
-			break;
-
-		case 0x794a:	// Request to change the final date of a banishment (timestamp) (absolute value)
-			if (RFIFOREST(fd) < 30)
-				return 0;
-			{
-				time_t timestamp;
-				char tmpstr[2048];
-				WFIFOW(fd,0) = 0x794b;
-				WFIFOL(fd,2) = 0xFFFFFFFF; // WTF???
-				account_name = (char*)RFIFOP(fd,2);
-				account_name[23] = '\0';
-				remove_control_chars(account_name);
-				timestamp = (time_t)RFIFOL(fd,26);
-				if (timestamp <= time(NULL))
-					timestamp = 0;
-				strftime(tmpstr, 24, login_config.date_format, localtime(&timestamp));
-				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;
-					ShowNotice("'ladmin': Change of the final date of a banishment (account: %s, new final date of banishment: %d (%s), ip: %s)\n", auth_dat[i].userid, timestamp, (timestamp == 0 ? "no banishment" : tmpstr), ip);
-					if (auth_dat[i].unban_time != timestamp) {
-						if (timestamp != 0) {
-							unsigned char buf[16];
-							WBUFW(buf,0) = 0x2731;
-							WBUFL(buf,2) = auth_dat[i].account_id;
-							WBUFB(buf,6) = 1; // 0: change of statut, 1: ban
-							WBUFL(buf,7) = (unsigned int)timestamp; // status or final date of a banishment
-							charif_sendallwos(-1, buf, 11);
-						}
-						auth_dat[i].unban_time = timestamp;
-						mmo_auth_sync();
-					}
-				} else {
-					memcpy(WFIFOP(fd,6), account_name, 24);
-					ShowNotice("'ladmin': Attempt to change the final date of a banishment of an unknown account (account: %s, received final date of banishment: %d (%s), ip: %s)\n", account_name, timestamp, (timestamp == 0 ? "no banishment" : tmpstr), ip);
-				}
-				WFIFOL(fd,30) = (unsigned int)timestamp;
-			}
-			WFIFOSET(fd,34);
-			RFIFOSKIP(fd,30);
-			break;
-
-		case 0x794c:	// Request to change the final date of a banishment (timestamp) (relative change)
-			if (RFIFOREST(fd) < 38)
-				return 0;
-			{
-				time_t timestamp;
-				struct tm *tmtime;
-				char tmpstr[2048];
-				WFIFOW(fd,0) = 0x794d;
-				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);
-					if (auth_dat[i].unban_time == 0 || auth_dat[i].unban_time < time(NULL))
-						timestamp = time(NULL);
-					else
-						timestamp = auth_dat[i].unban_time;
-					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) {
-						if (timestamp <= time(NULL))
-							timestamp = 0;
-						strftime(tmpstr, 24, login_config.date_format, localtime(&timestamp));
-						ShowNotice("'ladmin': Adjustment of a final date of a banishment (account: %s, (%+d y %+d m %+d d %+d h %+d mn %+d s) -> new validity: %d (%s), ip: %s)\n", auth_dat[i].userid, (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 ? "no banishment" : tmpstr), ip);
-						if (auth_dat[i].unban_time != timestamp) {
-							if (timestamp != 0) {
-								unsigned char buf[16];
-								WBUFW(buf,0) = 0x2731;
-								WBUFL(buf,2) = auth_dat[i].account_id;
-								WBUFB(buf,6) = 1; // 0: change of statut, 1: ban
-								WBUFL(buf,7) = (unsigned int)timestamp; // status or final date of a banishment
-								charif_sendallwos(-1, buf, 11);
-							}
-							auth_dat[i].unban_time = timestamp;
-							mmo_auth_sync();
-						}
-					} else {
-						strftime(tmpstr, 24, login_config.date_format, localtime(&auth_dat[i].unban_time));
-						ShowNotice("'ladmin': Impossible to adjust the final date of a banishment (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].unban_time, (auth_dat[i].unban_time == 0 ? "no banishment" : 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) = (unsigned long)auth_dat[i].unban_time;
-				} else {
-					memcpy(WFIFOP(fd,6), account_name, 24);
-					ShowNotice("'ladmin': Attempt to adjust the final date of a banishment of an unknown account (account: %s, ip: %s)\n", account_name, ip);
-					WFIFOL(fd,30) = 0;
-				}
-			}
-			WFIFOSET(fd,34);
-			RFIFOSKIP(fd,38);
-			break;
-
-		case 0x794e:	// Request to send a broadcast message
-			if (RFIFOREST(fd) < 8 || RFIFOREST(fd) < (8 + RFIFOL(fd,4)))
-				return 0;
-			WFIFOW(fd,0) = 0x794f;
-			WFIFOW(fd,2) = 0xFFFF; // WTF???
-			if (RFIFOL(fd,4) < 1) {
-				ShowNotice("'ladmin': Receiving a message for broadcast, but message is void (ip: %s)\n", ip);
-			} else {
-				// at least 1 char-server
-				for(i = 0; i < MAX_SERVERS; i++)
-					if (server[i].fd >= 0)
-						break;
-				if (i == MAX_SERVERS) {
-					ShowNotice("'ladmin': Receiving a message for broadcast, but no char-server is online (ip: %s)\n", ip);
-				} else {
-					unsigned char buf[32000];
-					char message[32000];
-					WFIFOW(fd,2) = 0;
-					memset(message, '\0', sizeof(message));
-					memcpy(message, RFIFOP(fd,8), RFIFOL(fd,4));
-					message[sizeof(message)-1] = '\0';
-					remove_control_chars(message);
-					if (RFIFOW(fd,2) == 0)
-						ShowNotice("'ladmin': Receiving a message for broadcast (message (in yellow): %s, ip: %s)\n", message, ip);
-					else
-						ShowNotice("'ladmin': Receiving a message for broadcast (message (in blue): %s, ip: %s)\n", message, ip);
-					// send same message to all char-servers (no answer)
-					memcpy(WBUFP(buf,0), RFIFOP(fd,0), 8 + RFIFOL(fd,4));
-					WBUFW(buf,0) = 0x2726;
-					charif_sendallwos(-1, buf, 8 + RFIFOL(fd,4));
-				}
-			}
-			WFIFOSET(fd,4);
-			RFIFOSKIP(fd,8 + RFIFOL(fd,4));
-			break;
-
-		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;
-				}
-			} 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;
-
-			account_name = (char*)RFIFOP(fd,2);
-			account_name[23] = '\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);
-				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) = 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
-			}
-			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
-			}
-
-			WFIFOSET(fd,150);
-		}
-			RFIFOSKIP(fd,6);
-			break;
-
-		default:
-			ShowStatus("'ladmin': End of connection, unknown packet (ip: %s)\n", ip);
-			set_eof(fd);
-			return 0;
-		}
-	}
-
-	return 0;
-}

+ 1 - 50
src/login/login.c

@@ -19,7 +19,6 @@
 #include <stdlib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <string.h>
 
 
-bool ladmin_auth(struct login_session_data* sd, const char* ip);
 struct Login_Config login_config;
 struct Login_Config login_config;
 
 
 int login_fd; // login server socket
 int login_fd; // login server socket
@@ -1224,7 +1223,7 @@ void login_auth_failed(struct login_session_data* sd, int result)
 
 
 
 
 //----------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------
-// Default packet parsing (normal players or administation/char-server connection requests)
+// Default packet parsing (normal players or char-server connection requests)
 //----------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------
 int parse_login(int fd)
 int parse_login(int fd)
 {
 {
@@ -1358,7 +1357,6 @@ int parse_login(int fd)
 		break;
 		break;
 
 
 		case 0x01db:	// Sending request of the coding key
 		case 0x01db:	// Sending request of the coding key
-		case 0x791a:	// Sending request of the coding key (administration packet)
 			RFIFOSKIP(fd,2);
 			RFIFOSKIP(fd,2);
 		{
 		{
 			memset(sd->md5key, '\0', sizeof(sd->md5key));
 			memset(sd->md5key, '\0', sizeof(sd->md5key));
@@ -1434,45 +1432,6 @@ int parse_login(int fd)
 		}
 		}
 		return 0; // processing will continue elsewhere
 		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;
-
-		case 0x7918:	// Request for administation login
-			if ((int)RFIFOREST(fd) < 4 || (int)RFIFOREST(fd) < ((RFIFOW(fd,2) == 0) ? 28 : 20))
-				return 0;
-		{
-			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;
-			}
-
-			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:
 		default:
 			ShowNotice("Abnormal end of connection (ip: %s): Unknown packet 0x%x\n", ip, command);
 			ShowNotice("Abnormal end of connection (ip: %s): Unknown packet 0x%x\n", ip, command);
 			set_eof(fd);
 			set_eof(fd);
@@ -1578,14 +1537,6 @@ int login_config_read(const char* cfgName)
 			login_config.ipban_cleanup_interval = (unsigned int)atoi(w2);
 			login_config.ipban_cleanup_interval = (unsigned int)atoi(w2);
 		else if(!strcmpi(w1, "ip_sync_interval"))
 		else if(!strcmpi(w1, "ip_sync_interval"))
 			login_config.ip_sync_interval = (unsigned int)1000*60*atoi(w2); //w2 comes in minutes.
 			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"))
 		else if(!strcmpi(w1, "import"))
 			login_config_read(w2);
 			login_config_read(w2);
 		else
 		else

+ 0 - 4
src/login/login.h

@@ -60,10 +60,6 @@ struct Login_Config {
 	bool check_client_version;                      // check the clientversion set in the clientinfo ?
 	bool check_client_version;                      // check the clientversion set in the clientinfo ?
 	uint32 client_version_to_connect;               // the client version needed to connect (if checking is enabled)
 	uint32 client_version_to_connect;               // the client version needed to connect (if checking is enabled)
 
 
-	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 ipban;                                     // perform IP blocking (via contents of `ipbanlist`) ?
 	bool dynamic_pass_failure_ban;                  // automatic IP blocking due to failed login attemps ?
 	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_interval; // how far to scan the loginlog for password failures

+ 2 - 29
src/map/chrif.c

@@ -38,7 +38,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
 	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, 0,	// 2b00-2b07: U->2b00, U->2b01, U->2b02, U->2b03, U->2b04, U->2b05, U->2b06, F->2b07
 	 6,-1,18, 7,-1,35,30, 0,	// 2b00-2b07: U->2b00, U->2b01, U->2b02, U->2b03, U->2b04, U->2b05, U->2b06, F->2b07
 	 6,30, 0, 0,86, 7,44,34,	// 2b08-2b0f: U->2b08, U->2b09, F->2b0a, F->2b0b, U->2b0c, U->2b0d, U->2b0e, U->2b0f
 	 6,30, 0, 0,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, 0,266,10,	// 2b10-2b17: U->2b10, U->2b11, U->2b12, U->2b13, U->2b14, F->2b15, U->2b16, U->2b17
+	11,10,10, 0,11, 0,266,10,	// 2b10-2b17: U->2b10, U->2b11, U->2b12, F->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
 	 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
 	-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
 //2b10: Outgoing, chrif_updatefamelist -> 'Update the fame ranking lists and send them'
 //2b10: Outgoing, chrif_updatefamelist -> 'Update the fame ranking lists and send them'
 //2b11: Outgoing, chrif_divorce -> 'tell the charserver to do divorce'
 //2b11: Outgoing, chrif_divorce -> 'tell the charserver to do divorce'
 //2b12: Incoming, chrif_divorceack -> 'divorce chars
 //2b12: Incoming, chrif_divorceack -> 'divorce chars
-//2b13: Incoming, chrif_accountdeletion -> 'Delete acc XX, if the player is on, kick ....'
+//2b13: FREE
 //2b14: Incoming, chrif_accountban -> 'not sure: kick the player with message XY'
 //2b14: Incoming, chrif_accountban -> 'not sure: kick the player with message XY'
 //2b15: FREE
 //2b15: FREE
 //2b16: Outgoing, chrif_ragsrvinfo -> 'sends base / job / drop rates ....'
 //2b16: Outgoing, chrif_ragsrvinfo -> 'sends base / job / drop rates ....'
@@ -942,32 +942,6 @@ int chrif_deadopt(int father_id, int mother_id, int child_id)
 
 
 	return 0;
 	return 0;
 }
 }
-/*==========================================
- * Disconnection of a player (account has been deleted in login-server) by [Yor]
- *------------------------------------------*/
-int chrif_accountdeletion(int fd)
-{
-	int acc;
-	struct map_session_data *sd;
-
-	acc = RFIFOL(fd,2);
-	if (battle_config.etc_log)
-		ShowNotice("chrif_accountdeletion %d.\n", acc);
-	sd = map_id2sd(acc);
-	if (acc > 0) {
-		if (sd != NULL) {
-			sd->login_id1++; // change identify, because if player come back in char within the 5 seconds, he can change its characters
-			clif_displaymessage(sd->fd, "Your account has been deleted (disconnection)...");
-			set_eof(sd->fd); // forced to disconnect for the change
-			map_quit(sd); // Remove leftovers (e.g. autotrading) [Paradox924X]
-		}
-	} else {
-		if (sd != NULL)
-			ShowError("chrif_accountdeletion failed - player not online.\n");
-	}
-
-	return 0;
-}
 
 
 /*==========================================
 /*==========================================
  * Disconnection of a player (account has been banned of has a status, from login-server) by [Yor]
  * Disconnection of a player (account has been banned of has a status, from login-server) by [Yor]
@@ -1426,7 +1400,6 @@ int chrif_parse(int fd)
 		case 0x2b0d: chrif_changedsex(fd); break;
 		case 0x2b0d: chrif_changedsex(fd); break;
 		case 0x2b0f: chrif_char_ask_name_answer(RFIFOL(fd,2), (char*)RFIFOP(fd,6), RFIFOW(fd,30), RFIFOW(fd,32)); break;
 		case 0x2b0f: chrif_char_ask_name_answer(RFIFOL(fd,2), (char*)RFIFOP(fd,6), RFIFOW(fd,30), RFIFOW(fd,32)); break;
 		case 0x2b12: chrif_divorceack(RFIFOL(fd,2), RFIFOL(fd,6)); break;
 		case 0x2b12: chrif_divorceack(RFIFOL(fd,2), RFIFOL(fd,6)); break;
-		case 0x2b13: chrif_accountdeletion(fd); break;
 		case 0x2b14: chrif_accountban(fd); break;
 		case 0x2b14: chrif_accountban(fd); break;
 		case 0x2b1b: chrif_recvfamelist(fd); break;
 		case 0x2b1b: chrif_recvfamelist(fd); break;
 		case 0x2b1d: chrif_load_scdata(fd); break;
 		case 0x2b1d: chrif_load_scdata(fd); break;

+ 0 - 85
tools/checkversion.pl

@@ -1,85 +0,0 @@
-#!/usr/bin/perl -w
-
-##########################################################################
-# INFORMATION TOOL ABOUT THE SERVERS VERSION OF ATHENA
-#
-# By connection on a server, this software display the version of the
-# designed server.
-#-------------------------------------------------------------------------
-# Usages:
-#   ./checkversion.pl IP:port
-#   ./checkversion.pl IP port
-#   perl checkversion.pl IP:port
-#   perl checkversion.pl IP port
-#
-# note: default port: 6900
-#
-# When successfull, the software return the value 0.
-#
-##########################################################################
-
-#------------------------- start of configuration ------------------------
-
-$connecttimeout = 10;   # Connection Timeout (in seconds)
-
-#-------------------------- End of configuration -------------------------
-
-use IO::Socket;
-
-unless($ARGV[0]) {
-	print "USAGE: $0 server_ip:port\n";
-	exit(1);
-}
-
-$server = $ARGV[0];
-$port = $ARGV[1];
-$port = $1 if ($server =~ s/:(\d+)//);
-$port ||= 6900;
-
-# Connection to the server
-my($so,$er) = ();
-eval{
-	$so = IO::Socket::INET->new(
-		PeerAddr=> $server,
-		PeerPort=> $port,
-		Proto   => "tcp",
-		Timeout => $connecttimeout) or $er = 1;
-};
-
-if($er || $@) {
-	print "Can't not connect to server [$server:$port] !\n";
-	exit(2);
-}
-
-# Request for the server version
-print $so pack("v",30000); # 0x7530
-$so->flush();
-
-# Receiving of the answer of the server
-if (read($so,$buf,10) < 10) {
-	print "Invalid answer. It isn't an athena server or it is a too old version.\n";
-	exit(5);
-}
-
-# Sending end of connection to the server
-print $so pack("v",30002); # 0x7532
-$so->flush();
-
-# Analyse of the answer
-my($ret,$maver,$miver,$rev,$dev,$mod,$type,$mdver) = unpack("v c6 v",$buf);
-
-if ($ret != 30001) { # 0x7531
-	print "Invalid answer. It isn't an athena server or it is a too old version.\n";
-	exit(6);
-}
-
-my(@stype) = ();
-foreach $i(0..3) {
-	push @stype,(("login","char","inter","map")[$i]) if( $type & (1<<$i) );
-}
-print "  ".join("/",@stype)." server [$server:$port].\n";
-printf "  Athena version %s-%d.%d", ("stable","dev")[$dev], $maver,$miver;
-printf " revision %d",$rev if $rev;
-printf "%s%d\n",("","-mod")[$mod],$mdver;
-
-exit(0);

+ 0 - 149
vcproj-10/ladmin.vcxproj

@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D356871D-58E1-450B-967A-E8E9646175AF}</ProjectGuid>
-    <RootNamespace>ladmin</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;MINICORE;FD_SETSIZE=4096;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AdditionalOptions>
-      </AdditionalOptions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libcmtd.lib;oldnames.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ladmin.exe</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;MINICORE;FD_SETSIZE=4096;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <AdditionalOptions>
-      </AdditionalOptions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>libcmt.lib;oldnames.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ladmin.exe</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\ladmin\ladmin.c" />
-    <ClCompile Include="..\src\common\core.c" />
-    <ClCompile Include="..\src\common\malloc.c" />
-    <ClCompile Include="..\src\common\md5calc.c" />
-    <ClCompile Include="..\src\common\showmsg.c" />
-    <ClCompile Include="..\src\common\socket.c" />
-    <ClCompile Include="..\src\common\strlib.c" />
-    <ClCompile Include="..\src\common\timer.c" />
-    <ClCompile Include="..\src\common\utils.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\ladmin\ladmin.h" />
-    <ClInclude Include="..\src\common\core.h" />
-    <ClInclude Include="..\src\common\malloc.h" />
-    <ClInclude Include="..\src\common\md5calc.h" />
-    <ClInclude Include="..\src\common\mmo.h" />
-    <ClInclude Include="..\src\common\showmsg.h" />
-    <ClInclude Include="..\src\common\socket.h" />
-    <ClInclude Include="..\src\common\strlib.h" />
-    <ClInclude Include="..\src\common\timer.h" />
-    <ClInclude Include="..\src\common\utils.h" />
-    <ClInclude Include="..\src\common\version.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

+ 0 - 1
vcproj-10/login-server_sql.vcxproj

@@ -153,7 +153,6 @@
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\login\account_sql.c" />
     <ClCompile Include="..\src\login\account_sql.c" />
-    <ClCompile Include="..\src\login\admin.c" />
     <ClCompile Include="..\src\login\ipban_sql.c" />
     <ClCompile Include="..\src\login\ipban_sql.c" />
     <ClCompile Include="..\src\login\login.c" />
     <ClCompile Include="..\src\login\login.c" />
     <ClCompile Include="..\src\login\loginlog_sql.c" />
     <ClCompile Include="..\src\login\loginlog_sql.c" />

+ 0 - 1
vcproj-10/login-server_txt.vcxproj

@@ -144,7 +144,6 @@
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\login\account_txt.c" />
     <ClCompile Include="..\src\login\account_txt.c" />
-    <ClCompile Include="..\src\login\admin.c" />
     <ClCompile Include="..\src\login\ipban_txt.c" />
     <ClCompile Include="..\src\login\ipban_txt.c" />
     <ClCompile Include="..\src\login\login.c" />
     <ClCompile Include="..\src\login\login.c" />
     <ClCompile Include="..\src\login\loginlog_txt.c" />
     <ClCompile Include="..\src\login\loginlog_txt.c" />

+ 0 - 4
vcproj-6/login-server_sql.dsp

@@ -207,10 +207,6 @@ SOURCE=..\src\login\account_sql.c
 # End Source File
 # End Source File
 # Begin Source File
 # Begin Source File
 
 
-SOURCE=..\src\login\admin.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\login\ipban.h
 SOURCE=..\src\login\ipban.h
 # End Source File
 # End Source File
 # Begin Source File
 # Begin Source File

+ 0 - 4
vcproj-6/login-server_txt.dsp

@@ -195,10 +195,6 @@ SOURCE=..\src\login\account_txt.c
 # End Source File
 # End Source File
 # Begin Source File
 # Begin Source File
 
 
-SOURCE=..\src\login\admin.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\login\ipban.h
 SOURCE=..\src\login\ipban.h
 # End Source File
 # End Source File
 # Begin Source File
 # Begin Source File

+ 0 - 3
vcproj-7.1/login-server_sql.vcproj

@@ -150,9 +150,6 @@
 			<File
 			<File
 				RelativePath="..\src\login\account_sql.c">
 				RelativePath="..\src\login\account_sql.c">
 			</File>
 			</File>
-			<File
-				RelativePath="..\src\login\admin.c">
-			</File>
 			<File
 			<File
 				RelativePath="..\src\login\ipban.h">
 				RelativePath="..\src\login\ipban.h">
 			</File>
 			</File>

+ 0 - 3
vcproj-7.1/login-server_txt.vcproj

@@ -153,9 +153,6 @@
 			<File
 			<File
 				RelativePath="..\src\login\account_txt.c">
 				RelativePath="..\src\login\account_txt.c">
 			</File>
 			</File>
-			<File
-				RelativePath="..\src\login\admin.c">
-			</File>
 			<File
 			<File
 				RelativePath="..\src\login\ipban.h">
 				RelativePath="..\src\login\ipban.h">
 			</File>
 			</File>

+ 0 - 285
vcproj-8/ladmin.vcproj

@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="ladmin"
-	ProjectGUID="{D356871D-58E1-450B-967A-E8E9646175AF}"
-	RootNamespace="ladmin"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".."
-			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\3rdparty\msinttypes\include"
-				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;MINICORE;FD_SETSIZE=4096"
-				GeneratePreprocessedFile="0"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
-				DefaultCharIsUnsigned="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/FIXED:NO"
-				AdditionalDependencies="libcmtd.lib oldnames.lib ws2_32.lib"
-				OutputFile="$(OutDir)\ladmin.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories=""
-				IgnoreAllDefaultLibraries="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".."
-			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\3rdparty\msinttypes\include"
-				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;MINICORE;FD_SETSIZE=4096"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="false"
-				DefaultCharIsUnsigned="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libcmt.lib oldnames.lib ws2_32.lib"
-				OutputFile="$(OutDir)\ladmin.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories=""
-				IgnoreAllDefaultLibraries="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				LinkTimeCodeGeneration="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="ladmin"
-			>
-			<File
-				RelativePath="..\src\ladmin\ladmin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\ladmin\ladmin.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="common"
-			>
-			<File
-				RelativePath="..\src\common\core.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\core.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\malloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\malloc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\md5calc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\md5calc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\mmo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\showmsg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\showmsg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\socket.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\socket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\strlib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\strlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\timer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\timer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\utils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\utils.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\version.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

+ 0 - 4
vcproj-8/login-server_sql.vcproj

@@ -208,10 +208,6 @@
 				RelativePath="..\src\login\account_sql.c"
 				RelativePath="..\src\login\account_sql.c"
 				>
 				>
 			</File>
 			</File>
-			<File
-				RelativePath="..\src\login\admin.c"
-				>
-			</File>
 			<File
 			<File
 				RelativePath="..\src\login\ipban.h"
 				RelativePath="..\src\login\ipban.h"
 				>
 				>

+ 0 - 4
vcproj-8/login-server_txt.vcproj

@@ -203,10 +203,6 @@
 				RelativePath="..\src\login\account_txt.c"
 				RelativePath="..\src\login\account_txt.c"
 				>
 				>
 			</File>
 			</File>
-			<File
-				RelativePath="..\src\login\admin.c"
-				>
-			</File>
 			<File
 			<File
 				RelativePath="..\src\login\ipban.h"
 				RelativePath="..\src\login\ipban.h"
 				>
 				>

+ 0 - 290
vcproj-9/ladmin.vcproj

@@ -1,290 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="ladmin"
-	ProjectGUID="{D356871D-58E1-450B-967A-E8E9646175AF}"
-	RootNamespace="ladmin"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".."
-			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\3rdparty\msinttypes\include"
-				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;MINICORE;FD_SETSIZE=4096"
-				GeneratePreprocessedFile="0"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
-				DefaultCharIsUnsigned="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/FIXED:NO"
-				AdditionalDependencies="libcmtd.lib oldnames.lib ws2_32.lib"
-				OutputFile="$(OutDir)\ladmin.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories=""
-				IgnoreAllDefaultLibraries="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".."
-			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\3rdparty\msinttypes\include"
-				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;MINICORE;FD_SETSIZE=4096"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="false"
-				DefaultCharIsUnsigned="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libcmt.lib oldnames.lib ws2_32.lib"
-				OutputFile="$(OutDir)\ladmin.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories=""
-				IgnoreAllDefaultLibraries="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				LinkTimeCodeGeneration="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="ladmin"
-			>
-			<File
-				RelativePath="..\src\ladmin\ladmin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\ladmin\ladmin.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="common"
-			>
-			<File
-				RelativePath="..\src\common\core.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\core.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\malloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\malloc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\md5calc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\md5calc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\mmo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\showmsg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\showmsg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\socket.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\socket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\strlib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\strlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\timer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\timer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\utils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\utils.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\common\version.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

+ 0 - 4
vcproj-9/login-server_sql.vcproj

@@ -213,10 +213,6 @@
 				RelativePath="..\src\login\account_sql.c"
 				RelativePath="..\src\login\account_sql.c"
 				>
 				>
 			</File>
 			</File>
-			<File
-				RelativePath="..\src\login\admin.c"
-				>
-			</File>
 			<File
 			<File
 				RelativePath="..\src\login\ipban.h"
 				RelativePath="..\src\login\ipban.h"
 				>
 				>

+ 0 - 4
vcproj-9/login-server_txt.vcproj

@@ -208,10 +208,6 @@
 				RelativePath="..\src\login\account_txt.c"
 				RelativePath="..\src\login\account_txt.c"
 				>
 				>
 			</File>
 			</File>
-			<File
-				RelativePath="..\src\login\admin.c"
-				>
-			</File>
 			<File
 			<File
 				RelativePath="..\src\login\ipban.h"
 				RelativePath="..\src\login\ipban.h"
 				>
 				>