diff options
| author |  Sadie Powell | 2023-01-24 02:58:46 +0000 |
|---|---|---|
| committer | Sadie Powell | 2023-01-24 02:58:46 +0000 |
| commit | f310e1c98dc262249146025ffffb81334b38680d (patch) | |
| tree | edd19152137e71db58efc5fbd289f34ce9b6919b /src/modules/m_ldapauth.cpp | |
| parent | Clean up some remaining old format string stuff. (diff) | |
Refactor the caching methods in User and rename to make more sense.
Diffstat (limited to 'src/modules/m_ldapauth.cpp')
| -rw-r--r-- | src/modules/m_ldapauth.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/modules/m_ldapauth.cpp b/src/modules/m_ldapauth.cpp index 642dbad88..b10945a43 100644 --- a/src/modules/m_ldapauth.cpp +++ b/src/modules/m_ldapauth.cpp @@ -124,7 +124,7 @@ public: if (!checkingAttributes && requiredattributes.empty()) { if (verbose) - ServerInstance->SNO.WriteToSnoMask('c', "Successful connection from {} (dn={})", user->GetFullRealHost(), DN); + ServerInstance->SNO.WriteToSnoMask('c', "Successful connection from {} (dn={})", user->GetRealMask(), DN); // We're done, there are no attributes to check SetVHost(user, DN); @@ -143,7 +143,7 @@ public: passed = true; if (verbose) - ServerInstance->SNO.WriteToSnoMask('c', "Successful connection from {} (dn={})", user->GetFullRealHost(), DN); + ServerInstance->SNO.WriteToSnoMask('c', "Successful connection from {} (dn={})", user->GetRealMask(), DN); SetVHost(user, DN); authed->Set(user); @@ -181,7 +181,7 @@ public: if (verbose) { ServerInstance->SNO.WriteToSnoMask('c', "Forbidden connection from {} (dn={}) (unable to validate attributes)", - user->GetFullRealHost(), DN); + user->GetRealMask(), DN); } ServerInstance->Users.QuitUser(user, killreason); delete this; @@ -205,7 +205,7 @@ public: if (verbose) { ServerInstance->SNO.WriteToSnoMask('c', "Forbidden connection from {} ({})", - user->GetFullRealHost(), err.getError()); + user->GetRealMask(), err.getError()); } ServerInstance->Users.QuitUser(user, killreason); } @@ -400,7 +400,7 @@ public: for (const auto& whitelistedcidr : whitelistedcidrs) { - if (InspIRCd::MatchCIDR(user->GetIPString(), whitelistedcidr, ascii_case_insensitive_map)) + if (InspIRCd::MatchCIDR(user->GetAddress(), whitelistedcidr, ascii_case_insensitive_map)) { ldapAuthed.Set(user, true); return MOD_RES_PASSTHRU; @@ -410,7 +410,7 @@ public: if (user->password.empty()) { if (verbose) - ServerInstance->SNO.WriteToSnoMask('c', "Forbidden connection from {} (no password provided)", user->GetFullRealHost()); + ServerInstance->SNO.WriteToSnoMask('c', "Forbidden connection from {} (no password provided)", user->GetRealMask()); ServerInstance->Users.QuitUser(user, killreason); return MOD_RES_DENY; } @@ -418,7 +418,7 @@ public: if (!LDAP) { if (verbose) - ServerInstance->SNO.WriteToSnoMask('c', "Forbidden connection from {} (unable to find LDAP provider)", user->GetFullRealHost()); + ServerInstance->SNO.WriteToSnoMask('c', "Forbidden connection from {} (unable to find LDAP provider)", user->GetRealMask()); ServerInstance->Users.QuitUser(user, killreason); return MOD_RES_DENY; } |