Merged the /loginmerge branch (topic:192754)

 * the login server storage, ipban and logging systems have been abstracted and now provide a common interface; the rest has been merged into a single login server core (no more login/login_sql duplicity)
 * storage systems are now added via compiler options (WITH_SQL / WITH_TXT)
 * multiple storage engines can be compiled in at the same time, and the config option account.engine defines which one will be used.
 * due to MySQL autoincrement limitations, accounts with id '0' will not be supported; account IDs from this point on should start from '1'.
 * login_log() functions now again record IP addresses in dotted format, not as 4-byte integers (undo from r6868).
 * removed config options that defined column names in the login table
 * removed `memo` and `error message` columns from login db/savefile
 * moved `loginlog` table to the logs database
 * added sql files upgrade_svn12975.sql and upgrade_svn12975_log.sql
 * due to changes to the login table layout, I added an !optional! sql file (upgrade_svn12975_view.sql) that will provide a certain degree of backwards compatibility with existing software; read the instructions inside carefully!
 * moved third-party includes/libs to a separate directory
 * updated project files / makefiles

Changed the way GM levels are handled
 * removed conf/gm_account.txt
 * added the gm level column to the txt savefile (after 'email' column)
 * gm level information is now transferred along with account data
 
For open problems see bugreport:1889.

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

1 files changed, 13 insertions, 26 deletions

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