* Added global sql settings 'sql.*' to inter_athena.conf.

* Made account, ipban and loginlog use the global sql settings when the hostname is empty.
* Commented 'ipban.sql.*' and 'account.sql.*' so they default to the global settings.
* Removed deprecated settings 'case_sensitive' and 'add_to_unlimited_account' from in login_athena.conf.
* Made inter_athena.conf be imported from login_athena.conf instead of being handled separate.
* Changed ipban to get the failed login attempts of an ip from loginlog (respects if loginlog is enabled or not).

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

1 files changed, 17 insertions, 24 deletions

diff --git a/conf/login_athena.conf b/conf/login_athena.conf
index 28f022c42..6026b7670 100644
--- a/conf/login_athena.conf
+++ b/conf/login_athena.conf
@@ -50,9 +50,6 @@ admin_allowed_host: 127.0.0.1
 // This prevents usage of >& log.file
 console: off
 
-// Are logins case sensitive? (SQL only)
-case_sensitive: yes
-
 // Can you use _M/_F to make new accounts on the server?
 new_account: yes
 
@@ -81,11 +78,6 @@ date_format: %Y-%m-%d %H:%M:%S
 // 0: all players (normal player are 0. it's default), 1-99: GM level at least with level x
 min_level_to_connect: 0
 
-// Give possibility to adjust (ladmin command: timeadd) the time of an unlimited account.
-// If set to on/1/yes..., the adjustment is be done from actual time to set the final time of the account.
-// If set to no/0/no..., the adjustment can not be done on an unlimited account. You must set (ladmin command: timeset) a final time before to adjust (ladmin command: timeadd)
-add_to_unlimited_account: off
-
 // Starting additional sec from now for the limited time at creation of account
 // -1: new account are created with UNlimited time (default value)
 // 0 or more: new accounts was created by addition of the value (in sec) to the actual time (to set first limited time)
@@ -103,12 +95,12 @@ use_MD5_passwords: no
 
 // Ipban features (SQL only)
 ipban.enable: yes
-ipban.sql.db_hostname: 127.0.0.1
-ipban.sql.db_port: 3306
-ipban.sql.db_username: ragnarok
-ipban.sql.db_password: ragnarok
-ipban.sql.db_database: ragnarok
-ipban.sql.ipban_table: ipbanlist
+//ipban.sql.db_hostname: 127.0.0.1
+//ipban.sql.db_port: 3306
+//ipban.sql.db_username: ragnarok
+//ipban.sql.db_password: ragnarok
+//ipban.sql.db_database: ragnarok
+//ipban.sql.ipban_table: ipbanlist
 // Dynamic password failure ipban system
 ipban.dynamic_pass_failure_ban: yes
 ipban.dynamic_pass_failure_ban_interval: 5
@@ -135,14 +127,15 @@ account.engine: auto
 account.txt.account_db: save/account.txt
 account.txt.case_sensitive: no
 // SQL
-account.sql.db_hostname: 127.0.0.1
-account.sql.db_port: 3306
-account.sql.db_username: ragnarok
-account.sql.db_password: ragnarok
-account.sql.db_database: ragnarok
-account.sql.codepage: 
-account.sql.case_sensitive: no
-account.sql.account_db: login
-account.sql.accreg_db: global_reg_value
-
+//account.sql.db_hostname: 127.0.0.1
+//account.sql.db_port: 3306
+//account.sql.db_username: ragnarok
+//account.sql.db_password: ragnarok
+//account.sql.db_database: ragnarok
+//account.sql.codepage: 
+//account.sql.case_sensitive: no
+//account.sql.account_db: login
+//account.sql.accreg_db: global_reg_value
+
+import: conf/inter_athena.conf
 import: conf/import/login_conf.txt