6 files changed, 63 insertions, 59 deletions
diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index 3e9fd15d4..d5371167f 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,5 +1,13 @@
 Date	Added
 
+2008/07/27
+	* Conf file adjustments for the loginmerge branch
+	- added new login and ipban db config options to login_athena.conf
+	- login database options are no longer in inter_athena.conf!
+	- moved setting 'lowest_gm_level' from inter_athena.conf to battle/gm.conf
+	- removed setting 'gm_read_method'
+	- removed options for setting `login` table column names
+	- deleted file GM_account.txt, now the savefile is used for this
 2008/07/23
 	* Increased max. hairstyle number, 23 -> 25 (bugreport:1773) [ultramage]
 2008/07/22
diff --git a/conf/GM_account.txt b/conf/GM_account.txt
deleted file mode 100644
index e49f9df16..000000000
--- a/conf/GM_account.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-// eAthena's GM Accounts File (for TXT servers only)
-// Edited by MC Cameri to enable account id ranges
-// Changing this file while login server is running 
-// Usage #1(Standard): <account id> <level>
-// Usage #2(Range): <beginning of range[-:~]end of range> <level>
-// Examples:
-// 2000002 99
-// 2000003-2000005 99
-// 2000003~2000005 99
-// 2000001 30
diff --git a/conf/battle/gm.conf b/conf/battle/gm.conf
index 1bfc4a372..ff0b1126a 100644
--- a/conf/battle/gm.conf
+++ b/conf/battle/gm.conf
@@ -30,6 +30,11 @@ atcommand_slave_clone_limit: 25
 // current map server.
 partial_name_scan: yes
 
+// The level at which a player with access is considered a GM. 
+// An account with an access level lower than this is not effected
+// by gm_can_drop_lv (battle_athena.conf). 
+lowest_gm_level: 1
+
 // [GM] Can use all skills? (No or mimimum GM level)
 gm_all_skill: no
 
diff --git a/conf/inter_athena.conf b/conf/inter_athena.conf
index c5dcd351d..ddb7c5e1b 100644
--- a/conf/inter_athena.conf
+++ b/conf/inter_athena.conf
@@ -1,5 +1,17 @@
 // Athena InterServer configuration.
 
+// Options for both versions
+
+// Log Inter Connections, etc.?
+log_inter: 1
+
+// Inter Log Filename
+inter_log_filename: log/inter.log
+
+// Level range for sharing within a party
+party_share_level: 10
+
+
 // TXT version options only
 
 // Storage flatfile database, used for Karfa storage.
@@ -26,32 +38,14 @@ castle_txt: save/castle.txt
 // Status change flatfile database, for status changes that are saved between sessions.
 scdata_txt: save/scdata.txt
 
-// Options for both versions
-
-// Log Inter Connections, etc.?
-log_inter: 1
-
-// Inter Log Filename
-inter_log_filename: log/inter.log
-
-// Level range for sharing within a party
-party_share_level: 10
 
 // SQL version options only
 
-// GM Reading Method
-// 1 to have Char read GMs, 0 to have Login-controlled GMs
-gm_read_method: 0
-
-// The level at which a player with access is considered a GM. 
-// An account with an access level lower than this is not effected
-// by gm_can_drop_lv (battle_athena.conf). 
-lowest_gm_level: 1
-
 // You can specify the codepage to use in your mySQL tables here.
 // (Note that this feature requires MySQL 4.1+)
 //default_codepage: 
 
+
 // For IPs, ideally under linux, you want to use localhost instead of 127.0.0.1 
 // Under windows, you want to use 127.0.0.1.  If you see a message like
 // "Can't connect to local MySQL server through socket '/tmp/mysql.sock' (2)"
@@ -96,16 +90,9 @@ db_server_logindb: ragnarok
 // this is meant for people who KNOW their stuff, and for some reason want to change their
 // database layout. [CLOWNISIUS]
 
-//Column names for the login table.
-login_db_account_id: account_id
-login_db_userid: userid
-login_db_user_pass: user_pass
-login_db_level: level
-
 // ALL MySQL Database Table names
 
 // Login Database Tables
-login_db: login
 loginlog_db: loginlog
 
 // Char Database Tables
diff --git a/conf/ladmin_athena.conf b/conf/ladmin_athena.conf
index b091b47ff..5c4257af7 100644
--- a/conf/ladmin_athena.conf
+++ b/conf/ladmin_athena.conf
@@ -15,11 +15,6 @@ admin_pass: admin
 // 2: password+key
 passenc: 2
 
-// Language of ladmin
-// F: Français
-// E: English (default)
-defaultlanguage: E
-
 // Log Filename. All operations done by the software are logged in this file.
 ladmin_log_filename: log/ladmin.log
 
diff --git a/conf/login_athena.conf b/conf/login_athena.conf
index c5a9fb242..28f022c42 100644
--- a/conf/login_athena.conf
+++ b/conf/login_athena.conf
@@ -38,13 +38,12 @@ console_silent: 0
 // Whether remote administration is enabled or disabled
 admin_state: no
 
-// Administrative password, used by ladmin (perl software) to connect remotely to server.
-// NOTICE: If you enable remote administration, you should change its value for security
-// NOTE: ladmin only works on TXT login servers.
+// 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_ip: 127.0.0.1
+admin_allowed_host: 127.0.0.1
 
 // Console Commands
 // Allow for console commands to be used on/off
@@ -62,15 +61,8 @@ new_account: yes
 allowed_regs: 1
 time_allowed: 10
 
-// Account flatfile database, stores account information.
-account_filename: save/account.txt
-
-// What account AIDs have GM privs, and what level?
-gm_account_filename: conf/GM_account.txt
-
-// Timer to check if GM_account file has been changed and reload GM account automaticaly
-// (in seconds; default: 15; value: 0 (disabled), or 2 or more)
-gm_account_filename_check_timer: 15
+// Log Filename. All operations received by the server are logged in this file. 
+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.
@@ -110,11 +102,18 @@ client_version_to_connect: 20
 use_MD5_passwords: no
 
 // 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
+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
+// Dynamic password failure ipban system
+ipban.dynamic_pass_failure_ban: yes
+ipban.dynamic_pass_failure_ban_interval: 5
+ipban.dynamic_pass_failure_ban_limit: 7
+ipban.dynamic_pass_failure_ban_duration: 5
 
 // 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.
@@ -126,4 +125,24 @@ dynamic_pass_failure_ban_duration: 5
 use_dnsbl: no
 dnsbl_servers: dnsbl.deltaanime.net
 
+// Which account engine to use.
+// 'auto' selects the first engine available (txt, sql, then others)
+// (defaults to auto)
+account.engine: auto
+
+// Account data storage configuration
+// TXT
+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
+
 import: conf/import/login_conf.txt