Some more txt/sql login server synchronization:

- removed the option to specify multiple IPs/subnets for 'ladminallowip'
- removed the @gm command and all associated management code
- removed the 'save unknown packets' code
- removed the lengthy TXT ipban code (which was essentially a copy of what's already handled by the socket layer/packet_athena.conf)
- implemented 'start_limited_time' in SQL (expiration for new accounts)
- applied some missing TXT changes from the last update

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

3 files changed, 2 insertions, 48 deletions

diff --git a/conf/atcommand_athena.conf b/conf/atcommand_athena.conf
index 025fc1c5b..d2deb9777 100644
--- a/conf/atcommand_athena.conf
+++ b/conf/atcommand_athena.conf
@@ -774,7 +774,6 @@ clearweather: 99
 
 //---------------------------------------------------------------
 // 100: Disabled commands
-gm: 100
 
 //---------------------
 // OTHER: not a command
diff --git a/conf/help2.txt b/conf/help2.txt
index 3a0772425..8f8330dbd 100644
--- a/conf/help2.txt
+++ b/conf/help2.txt
@@ -92,4 +92,3 @@
  99:@gat - For debugging (you inspect around gat)
  99:@packet - For debugging (packet variety)
 100:@nuke <char name> -
-100:@GM <password> - it becomes GM! (password is set in login_athena.conf)
diff --git a/conf/login_athena.conf b/conf/login_athena.conf
index f7ecb22bd..c5a9fb242 100644
--- a/conf/login_athena.conf
+++ b/conf/login_athena.conf
@@ -43,12 +43,8 @@ admin_state: no
 // NOTE: ladmin only works on TXT login servers.
 admin_pass: admin
 
-// Indicate the IP that the server accepts for remote administration.
-// put: 'all', or 'xxx.xxx.' (begin of an ip finished by '.' or a complete ip),
-//      or a network and its mask (example: '123.456.789.012/24' or '123.456.789.012/255.255.255.0')
-//      or 'clear' to suppress previous parameter (use it in import file mainly)
-// Add as many IP's as you wish.
-ladminallowip: all
+// Indicate the IP/host that the server accepts for remote administration.
+admin_allowed_ip: 127.0.0.1
 
 // Console Commands
 // Allow for console commands to be used on/off
@@ -58,19 +54,6 @@ console: off
 // Are logins case sensitive? (SQL only)
 case_sensitive: yes
 
-// Gamemaster password, used with the @gm command to obtain GM commands (level of gm set with level_new_gm parameter).
-// NOTICE: You should also change this one.
-gm_pass: gm
-
-// Level of new GM created with @gm command. (default: 60)
-// If you set to 0, you disable creation of new GM with @gm.
-// To be able to create a gm with @gm, you must:
-// - give a level to this value (not 0)
-// - enable to level 0 the @gm command (atcommand_athena.conf) (default 100)
-// - enable gm commands to normal player (battle_athena.conf, atcommand_gm_only parameter)
-// - and normal player must give correct password when he use the @gm command
-level_new_gm: 60
-
 // Can you use _M/_F to make new accounts on the server?
 new_account: yes
 
@@ -93,21 +76,12 @@ gm_account_filename_check_timer: 15
 // NOTE: The login-sql server needs the login logs to enable dynamic pass failure bans.
 log_login: yes
 
-// Name of the file of that logs the unknown packets (for debug or hack check)
-login_log_unknown_packets_filename: log/login_unknown_packets.log
-
 //When set to yes, the login server will refuse connections from accounts that are considered online already. 
 //When a login attempt is rejected, the account in question is also kicked from all connected char-servers.
 //It's safe to turn this off if there's only one char-server connected, or if the char-servers don't share 
 //the same backend (ie: Multiple char servers reading from the same SQL tables)
 online_check: yes
 
-// Indicate if the unknown packets are saved or not
-//(the unknown packets coming from the char-server or ladministration does not relate to, which is always saved)
-// Be careful: if you receive an attack, your hard disk can cause lag...
-// So, active this option with a speed hard disk or for debug only.
-save_unknown_packets: 0
-
 // Indicate how to display date in logs, to players, etc.
 date_format: %Y-%m-%d %H:%M:%S
 
@@ -125,24 +99,6 @@ add_to_unlimited_account: off
 // 0 or more: new accounts was created by addition of the value (in sec) to the actual time (to set first limited time)
 start_limited_time: -1
 
-// Ipban features (TXT only):
-
-// Specify order of IP control if necessary (option: 'deny,allow', 'allow,deny', or 'mutual-failture')
-// (how to use 'allow' and 'deny' information)
-//order: allow,deny
-
-// Indicate the IP that the server accept.
-// put: 'all', or 'xxx.xxx.' (begin of an ip finished by '.' or a complete ip),
-//      or a network and its mask (example: '123.456.789.012/24' or '123.456.789.012/255.255.255.0')
-//      or 'clear' to suppress previous parameter (use it in import file mainly)
-// Add as many IP's as you wish.
-//allow: all
-
-// Indicate the IP that the server refuse.
-// Add as many IP's as you wish, as long as you put deny: before it.
-//deny: 123.123.123.123
-//deny: 234.234.234.234
-
 // Check The clientversion set in the clientinfo ?
 check_client_version: no