mirror of
https://github.com/inspircd/inspircd.git
synced 2025-03-09 10:39:02 -04:00
Merge branch 'insp3' into master.
This commit is contained in:
commit
8b936aedde
10
configure
vendored
10
configure
vendored
@ -314,6 +314,16 @@ and crashes. Please consider using a different OS like FreeBSD/NetBSD instead.
|
||||
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.
|
||||
if (defined $version{REAL_LABEL}) {
|
||||
print_warning <<'EOW';
|
||||
|
@ -1089,7 +1089,7 @@ Matching extbans:
|
||||
realnameban module).
|
||||
s:<server> Matches users on a matching server (requires the
|
||||
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).
|
||||
w:<gateway> Matches users who are connecting via a WebIRC gateway that
|
||||
matches <gateway>.
|
||||
|
@ -189,7 +189,7 @@ class ModuleSQLAuth : public Module
|
||||
SQL::ParamMap userinfo;
|
||||
SQL::PopulateUserInfo(user, userinfo);
|
||||
userinfo["pass"] = user->password;
|
||||
userinfo["certfp"] = sslapi ? sslapi->GetFingerprint(user) : "";
|
||||
userinfo["sslfp"] = sslapi ? sslapi->GetFingerprint(user) : "";
|
||||
|
||||
for (const auto& algo : hash_algos)
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user