From bd3bed21189d0f03e499b1c54840a1cafdd96f1a Mon Sep 17 00:00:00 2001 From: Robby- Date: Mon, 28 Oct 2013 09:13:53 +0100 Subject: Fix some typos and touch up the configs a little. --- modules/commands/os_session.cpp | 2 +- modules/pseudoclients/nickserv.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/commands/os_session.cpp b/modules/commands/os_session.cpp index 80eee41f9..be003900d 100644 --- a/modules/commands/os_session.cpp +++ b/modules/commands/os_session.cpp @@ -692,7 +692,7 @@ class OSSession : public Module * decremented when the user is killed or quits - Adam */ ++session->count; - + if (kill && !exempt) { BotInfo *OperServ = Config->GetClient("OperServ"); diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp index 652f91a88..19e10a983 100644 --- a/modules/pseudoclients/nickserv.cpp +++ b/modules/pseudoclients/nickserv.cpp @@ -392,7 +392,7 @@ class NickServCore : public Module, public NickServService void OnUserNickChange(User *u, const Anope::string &oldnick) anope_override { NickAlias *old_na = NickAlias::Find(oldnick), *na = NickAlias::Find(u->nick); - /* If the new nick isnt registerd or its registerd and not yours */ + /* If the new nick isn't registered or it's registered and not yours */ if (!na || na->nc != u->Account()) { /* Remove +r, but keep an account associated with the user */ -- cgit From 710d4848bd7c42fbd203d976aadd7044fdc6d8c7 Mon Sep 17 00:00:00 2001 From: Robby- Date: Mon, 28 Oct 2013 09:25:17 +0100 Subject: Fix kill and killquick default expiry times. ns_access and ns_cert: Fix accessmax defaults, also state in the config that 0 is not a valid value. --- modules/commands/ns_access.cpp | 2 +- modules/commands/ns_cert.cpp | 2 +- modules/pseudoclients/nickserv.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'modules') diff --git a/modules/commands/ns_access.cpp b/modules/commands/ns_access.cpp index ddbcad0a2..15bddeb36 100644 --- a/modules/commands/ns_access.cpp +++ b/modules/commands/ns_access.cpp @@ -28,7 +28,7 @@ class CommandNSAccess : public Command return; } - if (nc->access.size() >= Config->GetModule(this->owner)->Get("accessmax")) + if (nc->access.size() >= Config->GetModule(this->owner)->Get("accessmax", "32")) { source.Reply(_("Sorry, the maximum of %d access entries has been reached."), Config->GetModule(this->owner)->Get("accessmax")); return; diff --git a/modules/commands/ns_cert.cpp b/modules/commands/ns_cert.cpp index 6b3aa2a14..09754a90d 100644 --- a/modules/commands/ns_cert.cpp +++ b/modules/commands/ns_cert.cpp @@ -138,7 +138,7 @@ class CommandNSCert : public Command { NSCertList *cl = nc->Require("certificates"); - if (cl->GetCertCount() >= Config->GetModule(this->owner)->Get("accessmax")) + if (cl->GetCertCount() >= Config->GetModule(this->owner)->Get("accessmax", "5")) { source.Reply(_("Sorry, the maximum of %d certificate entries has been reached."), Config->GetModule(this->owner)->Get("accessmax")); return; diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp index 19e10a983..69a871514 100644 --- a/modules/pseudoclients/nickserv.cpp +++ b/modules/pseudoclients/nickserv.cpp @@ -181,13 +181,13 @@ class NickServCore : public Module, public NickServService } else if (na->nc->HasExt("KILL_QUICK")) { - time_t killquick = Config->GetModule("nickserv")->Get("killquick", "60s"); + time_t killquick = Config->GetModule("nickserv")->Get("killquick", "20s"); u->SendMessage(NickServ, _("If you do not change within %s, I will change your nick."), Anope::Duration(killquick, u->Account()).c_str()); new NickServCollide(this, u, na, killquick); } else { - time_t kill = Config->GetModule("nickserv")->Get("kill", "20s"); + time_t kill = Config->GetModule("nickserv")->Get("kill", "60s"); u->SendMessage(NickServ, _("If you do not change within %s, I will change your nick."), Anope::Duration(kill, u->Account()).c_str()); new NickServCollide(this, u, na, kill); } -- cgit From 498da95205556995cfd81bddab3657fc294125c0 Mon Sep 17 00:00:00 2001 From: Robby- Date: Mon, 28 Oct 2013 09:30:20 +0100 Subject: Stop requesting identification when changing nicks to a registered nick, and the current client certificate fingerprint matches one on the nickname's list. --- modules/pseudoclients/nickserv.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'modules') diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp index 69a871514..4c512b427 100644 --- a/modules/pseudoclients/nickserv.cpp +++ b/modules/pseudoclients/nickserv.cpp @@ -151,6 +151,8 @@ class NickServCore : public Module, public NickServService this->Collide(u, na); return; } + else if (MOD_RESULT == EVENT_ALLOW) + return; if (!na->nc->HasExt("NS_SECURE") && u->IsRecognized()) { -- cgit From 4a1d32c5fdc4cabdd6a26dbda70abec76b3153a0 Mon Sep 17 00:00:00 2001 From: Robby- Date: Mon, 28 Oct 2013 09:30:56 +0100 Subject: Fix logging when identifying with an SSL certificate fingerprint. --- modules/commands/ns_cert.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'modules') diff --git a/modules/commands/ns_cert.cpp b/modules/commands/ns_cert.cpp index 09754a90d..ce7d53e51 100644 --- a/modules/commands/ns_cert.cpp +++ b/modules/commands/ns_cert.cpp @@ -334,7 +334,7 @@ class NSCert : public Module u->Identify(na); u->SendMessage(NickServ, _("SSL certificate fingerprint accepted, you are now identified.")); - Log(u) << "automatically identified for account " << na->nc->display << " via SSL certificate fingerprint"; + Log(NickServ) << u->GetMask() << " automatically identified for account " << na->nc->display << " via SSL certificate fingerprint"; } EventReturn OnNickValidate(User *u, NickAlias *na) anope_override @@ -342,9 +342,10 @@ class NSCert : public Module NSCertList *cl = certs.Get(na->nc); if (!u->fingerprint.empty() && cl && cl->FindCert(u->fingerprint)) { + BotInfo *NickServ = Config->GetClient("NickServ"); u->Identify(na); - u->SendMessage(Config->GetClient("NickServ"), _("SSL certificate fingerprint accepted, you are now identified.")); - Log(u) << "automatically identified for account " << na->nc->display << " via SSL certificate fingerprint"; + u->SendMessage(NickServ, _("SSL certificate fingerprint accepted, you are now identified.")); + Log(NickServ) << u->GetMask() << " automatically identified for account " << na->nc->display << " via SSL certificate fingerprint"; return EVENT_ALLOW; } -- cgit