diff options
| author |  Sadie Powell | 2019-02-05 00:47:30 +0000 |
|---|---|---|
| committer | Sadie Powell | 2019-02-05 00:47:30 +0000 |
| commit | bfa5fb407e13ad4adb5c062021de50ecd760ed95 (patch) | |
| tree | c573269b1a94fd7e7da27c1b90b05fa60916de23 /include/modules | |
| parent | Remove support for the deprecated <power> config tag. (diff) | |
| parent | ModuleManager: use std::flush instead of fflush(stdout). (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'include/modules')
| -rw-r--r-- | include/modules/exemption.h | 4 | ||||
| -rw-r--r-- | include/modules/server.h | 1 | ||||
| -rw-r--r-- | include/modules/ssl.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/include/modules/exemption.h b/include/modules/exemption.h index b590a5797..a33d67f98 100644 --- a/include/modules/exemption.h +++ b/include/modules/exemption.h @@ -41,8 +41,8 @@ class CheckExemption::EventListener : public Events::ModuleEventListener { protected: - EventListener(Module* mod) - : ModuleEventListener(mod, "event/exemption") + EventListener(Module* mod, unsigned int eventprio = DefaultPriority) + : ModuleEventListener(mod, "event/exemption", eventprio) { } diff --git a/include/modules/server.h b/include/modules/server.h index 54ea5d58c..f9907ef26 100644 --- a/include/modules/server.h +++ b/include/modules/server.h @@ -65,5 +65,4 @@ class ServerEventListener : public Events::ModuleEventListener * @param server The target of the burst. */ virtual void OnSyncNetwork(ProtocolServer& server) { } - }; diff --git a/include/modules/ssl.h b/include/modules/ssl.h index 69bd65009..701c0d1f4 100644 --- a/include/modules/ssl.h +++ b/include/modules/ssl.h @@ -206,7 +206,7 @@ class SSLIOHook : public IOHook std::string GetFingerprint() const { ssl_cert* cert = GetCertificate(); - if (cert && certificate->IsUsable()) + if (cert && cert->IsUsable()) return cert->GetFingerprint(); return ""; } |