ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 18:49:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'insp3' into master.

Browse Source
This commit is contained in:
Sadie Powell 2021-09-01 04:33:45 +01:00
commit 8b936aedde
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -314,6 +314,16 @@ and crashes. Please consider using a different OS like FreeBSD/NetBSD instead.
EOW EOW
} }
# Warn about how quirky musl's libdl implementation is.
chomp(my $machine = `$config{CXX} -dumpmachine 2>/dev/null`);
if ($machine =~ /-musl$/) {
print_warning <<'EOW';
You are building InspIRCd with musl. This libc does not have a useful
dlclose() implementation which causes problems with unloading and reloading
modules. Please complain to the musl maintainers if this is an issue for you.
EOW
}
# Check that the user actually wants this version. # Check that the user actually wants this version.
if (defined $version{REAL_LABEL}) { if (defined $version{REAL_LABEL}) {
print_warning <<'EOW'; print_warning <<'EOW';

2
docs/conf/helpop.conf.example
View File

@ -1089,7 +1089,7 @@ Matching extbans:
realnameban module). realnameban module).
s:<server> Matches users on a matching server (requires the s:<server> Matches users on a matching server (requires the
serverban module). serverban module).
z:<certfp> Matches users having the given TLS certificate z:<sslfp> Matches users having the given TLS certificate
fingerprint (requires the sslmodes module). fingerprint (requires the sslmodes module).
w:<gateway> Matches users who are connecting via a WebIRC gateway that w:<gateway> Matches users who are connecting via a WebIRC gateway that
matches <gateway>. matches <gateway>.

2
src/modules/m_sqlauth.cpp
View File

@ -189,7 +189,7 @@ class ModuleSQLAuth : public Module
SQL::ParamMap userinfo; SQL::ParamMap userinfo;
SQL::PopulateUserInfo(user, userinfo); SQL::PopulateUserInfo(user, userinfo);
userinfo["pass"] = user->password; userinfo["pass"] = user->password;
userinfo["certfp"] = sslapi ? sslapi->GetFingerprint(user) : ""; userinfo["sslfp"] = sslapi ? sslapi->GetFingerprint(user) : "";
for (const auto& algo : hash_algos) for (const auto& algo : hash_algos)
{ {