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.

4 files changed, 15 insertions, 5 deletions

diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf
index a3db10c18..4791af26a 100644
--- a/data/nickserv.example.conf
+++ b/data/nickserv.example.conf
@@ -249,6 +249,7 @@ module
 
 	/*
 	 * The maximum number of entries allowed on a nickname's access list.
+	 * If not set, the default is 32. This number cannot be set to 0.
 	 */
 	accessmax = 32
 
@@ -297,7 +298,16 @@ command { service = "NickServ"; name = "ALIST"; command = "nickserv/alist"; }
  *
  * Used for configuring your SSL certificate list, which can be used to automatically identify you.
  */
-module { name = "ns_cert"; accessmax = 5; }
+module
+{
+	name = "ns_cert"
+
+	/*
+	 * The maximum number of entries allowed on a nickname's certificate fingerprint list.
+	 * The default is 5. This number cannot be set to 0.
+	 */
+	accessmax = 5
+}
 command { service = "NickServ"; name = "CERT"; command = "nickserv/cert"; }
 
 /*
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<unsigned>("accessmax"))
+		if (nc->access.size() >= Config->GetModule(this->owner)->Get<unsigned>("accessmax", "32"))
 		{
 			source.Reply(_("Sorry, the maximum of %d access entries has been reached."), Config->GetModule(this->owner)->Get<unsigned>("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<NSCertList>("certificates");
 
-		if (cl->GetCertCount() >= Config->GetModule(this->owner)->Get<unsigned>("accessmax"))
+		if (cl->GetCertCount() >= Config->GetModule(this->owner)->Get<unsigned>("accessmax", "5"))
 		{
 			source.Reply(_("Sorry, the maximum of %d certificate entries has been reached."), Config->GetModule(this->owner)->Get<unsigned>("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<time_t>("killquick", "60s");
+				time_t killquick = Config->GetModule("nickserv")->Get<time_t>("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<time_t>("kill", "20s");
+				time_t kill = Config->GetModule("nickserv")->Get<time_t>("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);
 			}