diff options
| author | Drahy <none@none> | 2009-07-27 07:40:52 +0200 |
|---|---|---|
| committer | Drahy <none@none> | 2009-07-27 07:40:52 +0200 |
| commit | afd5658de56d471f0e364f19ed13cccc84175d39 (patch) | |
| tree | 55818fb43a749dad720dce1301b9aa68649863ec /src/trinitycore | |
| parent | 6a8484ce25f5f278f6546177c57eb74fa556dfd7 (diff) | |
| parent | 190863e5a58364a9f42336e300c836d9ec6242ad (diff) | |
* Merge
--HG--
branch : trunk
Diffstat (limited to 'src/trinitycore')
| -rw-r--r-- | src/trinitycore/RASocket.cpp | 5 | ||||
| -rw-r--r-- | src/trinitycore/trinitycore.conf.dist | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/trinitycore/RASocket.cpp b/src/trinitycore/RASocket.cpp index 50a1af87256..b15f4e447d6 100644 --- a/src/trinitycore/RASocket.cpp +++ b/src/trinitycore/RASocket.cpp @@ -25,7 +25,6 @@ #include "Common.h" #include "Config/ConfigEnv.h" #include "Database/DatabaseEnv.h" - #include "AccountMgr.h" #include "Log.h" #include "RASocket.h" @@ -198,8 +197,8 @@ void RASocket::OnRead() LoginDatabase.escape_string(pw); QueryResult *check = LoginDatabase.PQuery( - "SELECT 1 FROM account WHERE username = '%s' AND sha_pass_hash=SHA1(CONCAT(username,':','%s'))", - login.c_str(), pw.c_str()); + "SELECT 1 FROM account WHERE username = '%s' AND sha_pass_hash=SHA1(CONCAT('%s',':','%s'))", + login.c_str(), login.c_str(), pw.c_str()); if(check) { diff --git a/src/trinitycore/trinitycore.conf.dist b/src/trinitycore/trinitycore.conf.dist index 9a33a2daf6e..cbc2ee54f3d 100644 --- a/src/trinitycore/trinitycore.conf.dist +++ b/src/trinitycore/trinitycore.conf.dist @@ -632,8 +632,8 @@ ChatLogTimestamp = 0 # # AllFlightPaths # Players will start with all flight paths (Note: ALL flight paths, not only player's team) -# Default: 0 (true) -# 1 (false) +# Default: 0 (false) +# 1 (true) # # AlwaysMaxSkillForLevel # Players will automatically gain max level dependent (weapon/defense) skill when logging in, leveling up etc. |