diff options
| author |  Sadie Powell | 2021-12-14 16:56:48 +0000 |
|---|---|---|
| committer | Sadie Powell | 2021-12-14 16:56:48 +0000 |
| commit | e9d54724e6cf9ff3772795cf5eed4b259700214f (patch) | |
| tree | c7e06a9ca507df1db4eb5dc2e40a10da8198c086 /src/serializable.cpp | |
| parent | Revert "Remove support for defaults in find_{compiler,linker}_flags()". (diff) | |
| parent | If a user has a unique username then include it in bans. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/serializable.cpp')
| -rw-r--r-- | src/serializable.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/serializable.cpp b/src/serializable.cpp index f6ff634f9..9bc08f325 100644 --- a/src/serializable.cpp +++ b/src/serializable.cpp @@ -129,6 +129,7 @@ bool User::Deserialize(Serializable::Data& data) return false; int client_port; + bool user_uniqueusername; std::string client_addr; std::string user_modes; std::string user_oper; @@ -148,11 +149,13 @@ bool User::Deserialize(Serializable::Data& data) .Load("realhost", realhost) .Load("realname", realname) .Load("signon", signon) - .Load("snomasks", user_snomasks); + .Load("snomasks", user_snomasks) + .Load("uniqueusername", user_uniqueusername); // Apply the rest of the members. modes = std::bitset<ModeParser::MODEID_MAX>(user_modes); snomasks = std::bitset<64>(user_snomasks); + uniqueusername = user_uniqueusername; ServerConfig::OperIndex::const_iterator iter = ServerInstance->Config->OperTypes.find(user_oper); if (iter != ServerInstance->Config->OperTypes.end()) @@ -210,6 +213,7 @@ bool User::Serialize(Serializable::Data& data) .Store("realname", realname) .Store("signon", signon) .Store("snomasks", snomasks.to_string()) + .Store("uniqueusername", uniqueusername) .Store("uuid", uuid); return true; |