committing my work on the login server (mostly SQL)

- removed the check_ip_flag from login&char (there since r1)
- removed the CMP_AUTHFIFO_IP and CMP_AUTHFIFO_LOGIN2 defines (also r1)
- removed dynamic_account_ban, gm_db settings, weren't doing anything at all
- modified the date_format setting to take the format string directly
- removed overly verbose config loading messages
- removed/simplified many more useless actions
- renamed the dynamic_pass_failure_ban_ settings to make more sense
- collected relevant config settings into a login_config structure and documented their purpose
- allowed usage of yes/no instead of the user-unfriendly 1/0 method in config settings (and added 1/0 as a possible option)
- fixed dnsbl which was always taking only the first entry into account

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

1 files changed, 23 insertions, 37 deletions

diff --git a/conf-tmpl/login_athena.conf b/conf-tmpl/login_athena.conf
index fa79f4958..f4496c5d0 100644
--- a/conf-tmpl/login_athena.conf
+++ b/conf-tmpl/login_athena.conf
@@ -54,7 +54,7 @@ ladminallowip: all
 // This prevents usage of >& log.file
 console: off
 
-// Are login's case sensitive (SQL only)?
+// Are logins case sensitive? (SQL only)
 case_sensitive: on
 
 // Gamemaster password, used with the @gm command to obtain GM commands (level of gm set with level_new_gm parameter).
@@ -70,11 +70,10 @@ gm_pass: gm
 // - and normal player must give correct password when he use the @gm command
 level_new_gm: 60
 
-// Can you make new accounts on the server? (1 for Yes, 0 for no) 
-// (1 = _M/_F enabled, 0 = not enabled)
-new_account: 1
+// Can you use _M/_F to make new accounts on the server?
+new_account: yes
 
-// ********** account registration flood system **********
+// Account registration flood protection system
 // allowed_regs is the number of registrations allowed in time_allowed (in seconds)
 allowed_regs: 1
 time_allowed: 10
@@ -94,7 +93,7 @@ login_log_filename: log/login.log
 
 // To log the login server?
 // NOTE: The login-sql server needs the login logs to enable dynamic pass failure bans.
-log_login: 1
+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
@@ -124,11 +123,7 @@ display_parse_admin: 0
 display_parse_fromchar: 0
 
 // 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
+date_format: %Y-%m-%d %H:%M:%S
 
 // Indicate the minimum GM level of player that the server accepts to connection.
 // 0: all players (normal player are 0. it's default), 1-99: GM level at least with level x
@@ -144,14 +139,7 @@ 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
 
-// It's to check IP of a player between login-server and char-server (part of anti-hacking system)
-// If player doesn't have same IP, connection is refused.
-// Set to 0/off/no to not check IP of player.
-// Set to 1/on/yes if you want to check (default)
-// Note: if you enable this option, be sure that your (local/lan/wan) players use correct ip (in xml file) to contact servers,
-//       and that your LAN is correctly configured (!), and that LAN configuration of eathena is right.
-//       if not correct, you can read list of char-servers, but not look slots of characters (rejected by server).
-check_ip_flag: yes
+// 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)
@@ -169,32 +157,30 @@ check_ip_flag: yes
 //deny: 123.123.123.123
 //deny: 234.234.234.234
 
-//Check The clientversion set in the clientinfo ?
+// Check The clientversion set in the clientinfo ?
 check_client_version: no
 
-//What version we would allow to connect? (if the options above is enabled..)
+// What version we would allow to connect? (if the options above is enabled..)
 client_version_to_connect: 20
 
-//Passwords in Login DB are MD5 - <passwordencrypt> cannot b used on client with this on
+// Passwords in Login DB are MD5 - <passwordencrypt> cannot b used on client with this on
 use_MD5_passwords: no
 
-//Ban features: read readme for more info if you dont know this.
-ipban: 1
-dynamic_pass_failure_ban: 1
-dynamic_pass_failure_ban_time: 5
-dynamic_pass_failure_ban_how_many: 7
-dynamic_pass_failure_ban_how_long: 5
-dynamic_account_ban: 1
-dynamic_account_ban_class: 0
-
-//Interval (in minutes) to execute a DNS/IP update. Disabled by default.
-//Enable it if your server uses a dynamic IP which changes with time.
-//ip_sync_interval: 10
+// Ipban features (SQL only)
+ipban: yes
+dynamic_pass_failure_ban: yes
+dynamic_pass_failure_ban_interval: 5
+dynamic_pass_failure_ban_limit: 7
+dynamic_pass_failure_ban_duration: 5
 
-//DNS Blacklist Blocking (on: 1, off: 0)
-use_dnsbl: 0
+// Interval (in minutes) to execute a DNS/IP update. Disabled by default.
+// Enable it if your server uses a dynamic IP which changes with time.
+//ip_sync_interval: 10
 
-//DNS Servers (seperated by a comma)
+// DNS Blacklist Blocking
+// If enabled, each incoming connection will be tested against the blacklists
+// on the specified dnsbl_servers (comma-separated list)
+use_dnsbl: no
 dnsbl_servers: dnsbl.deltaanime.net
 
 import: conf/import/login_conf.txt