From 01bd26d2289dcb6d7f2b8045e086a06563379e4b Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Mon, 6 Oct 2014 21:44:20 +0200 Subject: [PATCH] Misc typos fixing --- servatrice/servatrice.ini.example | 14 +++++++------- servatrice/src/servatrice_database_interface.cpp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/servatrice/servatrice.ini.example b/servatrice/servatrice.ini.example index 14e01d25..05a5ba3a 100644 --- a/servatrice/servatrice.ini.example +++ b/servatrice/servatrice.ini.example @@ -1,7 +1,7 @@ ; Servatrice configuration file ; ; This is the main configuration file for Servatrice; while using a configuration is not mandatory, -; you may want to customize some aspects of your servatrice instance, lie its name, port or the way +; you may want to customize some aspects of your servatrice instance, like its name, port or the way ; users can authenticate to the server. @@ -22,18 +22,19 @@ port=4747 ; long delays (lag), you may want to try increasing this value; default is 1. number_pools=1 -; When database is eneabled, servatrice writes the server status in the "update" database table; this +; When database is enabled, servatrice writes the server status in the "update" database table; this ; setting defines every how many milliseconds servatrice will update its status; default is 15000 (15 secs) statusupdate=15000 ; Do you want servatrice to write important events and errors to a logfile? Default is 1 (yes). writelog=1 -; Choose a name for the log file, if enabled; the default file name is server.log +; Choose a name for the log file, if enabled; you can specify an absolute path or a path relative to +; the servatrice executable; the default file name is server.log (in the same path as servatrice) logfile=server.log -; You may want to silence some useless, commonly recurring messages in the logfile. This setting can contain -; a comma-separed list of words; if any message that is about to be logged contains at least one of these words, +; You may want to silence some commonly recurring messages in the logfile. This setting can contain a +; comma-separed list of words; if any message that is about to be logged contains at least one of these words, ; it won't be logged. Default is empty; example: "kittens,ponies,faires" logfilters="" @@ -47,11 +48,10 @@ logfilters="" ; Please note that only the "sql" method permits to have registered users and store their data on the server. method=none -; if the chosen authentication methos is password, here you can define the password your users will use to log in +; if the chosen authentication method is password, here you can define the password your users will use to log in password=123456 ; Accept only registered users? default is 0 (accept unregistered users) -; FIXME: unused / not working regonly=0 diff --git a/servatrice/src/servatrice_database_interface.cpp b/servatrice/src/servatrice_database_interface.cpp index fa9e8b6a..2a97664b 100644 --- a/servatrice/src/servatrice_database_interface.cpp +++ b/servatrice/src/servatrice_database_interface.cpp @@ -95,7 +95,7 @@ AuthenticationResult Servatrice_DatabaseInterface::checkUserPassword(Server_Prot case Servatrice::AuthenticationNone: return UnknownUser; case Servatrice::AuthenticationPassword: { QString configPassword = settingsCache->value("authentication/password").toString(); - if(configPassword == password) + if (configPassword == password) return PasswordRight; return NotLoggedIn;