diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
commit | 5bfc376d1cee0f941657a771b87a3ee030d31c56 (patch) | |
tree | de739c3845aa3f5bb9cb4bb79236551d5f3fc8b5 /src/account-server/accounthandler.cpp | |
parent | c53bc90dbaa876a86f762a3d864b1f920e2b8071 (diff) | |
parent | d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50 (diff) | |
download | manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.gz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.bz2 manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.xz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.zip |
Merge branch 'master' into lpc2012
Diffstat (limited to 'src/account-server/accounthandler.cpp')
-rw-r--r-- | src/account-server/accounthandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/account-server/accounthandler.cpp b/src/account-server/accounthandler.cpp index 41b2c034..70984cc1 100644 --- a/src/account-server/accounthandler.cpp +++ b/src/account-server/accounthandler.cpp @@ -346,7 +346,7 @@ void AccountHandler::handleLoginMessage(AccountClient &client, MessageIn &msg) // Check whether the last login attempt for this IP is still too fresh const int address = client.getIP(); - const time_t now = time(NULL); + const time_t now = time(nullptr); IPsToTime::const_iterator it = mLastLoginAttemptForIP.find(address); if (it != mLastLoginAttemptForIP.end()) { |