diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configreader.h | 6 | ||||
| -rw-r--r-- | include/inspircd.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/configreader.h b/include/configreader.h index 1bd6766be..31551dedb 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -335,7 +335,7 @@ class CoreExport ServerConfig : public Extensible /** User that is currently performing a rehash, needed because the * rehash code is now threaded and needs to know who to give errors and feedback to. */ - User* RehashUser; + std::string RehashUserUID; /** Rehash parameter, as above */ @@ -780,7 +780,7 @@ class CoreExport ServerConfig : public Extensible * and initialize this class. All other methods * should be used only by the core. */ - void Read(bool bail, User* user); + void Read(bool bail, const std::string &useruid); /** Read a file into a file_cache object */ @@ -796,7 +796,7 @@ class CoreExport ServerConfig : public Extensible * this user as SNOTICEs. * If the parameter is NULL, the messages are spooled to all opers. */ - void ReportConfigError(const std::string &errormessage, bool bail, User* user); + void ReportConfigError(const std::string &errormessage, bool bail, const std::string &useruid); /** Load 'filename' into 'target', with the new config parser everything is parsed into * tag/key/value at load-time rather than at read-value time. diff --git a/include/inspircd.h b/include/inspircd.h index 8e5a5b2a8..4e37fae8d 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -283,9 +283,9 @@ class CoreExport ConfigReaderThread : public Thread { InspIRCd* ServerInstance; bool do_bail; - User* TheUser; + std::string TheUserUID; public: - ConfigReaderThread(InspIRCd* Instance, bool bail, User* user) : Thread(), ServerInstance(Instance), do_bail(bail), TheUser(user) + ConfigReaderThread(InspIRCd* Instance, bool bail, const std::string &useruid) : Thread(), ServerInstance(Instance), do_bail(bail), TheUserUID(useruid) { } |