summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaram Qashat cyberbotx@cyberbotx.com <Naram Qashat cyberbotx@cyberbotx.com@5417fbe8-f217-4b02-8779-1006273d7864>2008-10-25 02:40:13 +0000
committerNaram Qashat cyberbotx@cyberbotx.com <Naram Qashat cyberbotx@cyberbotx.com@5417fbe8-f217-4b02-8779-1006273d7864>2008-10-25 02:40:13 +0000
commit8eba4873bbe090795edd33e9a831348e02a47810 (patch)
tree4d5cb52d278adabbab27c538460e8dfc02861c93
parentaf18a3318d001339eb26aa84d098fa5d91885886 (diff)
Added autokilldatabase directive to operserv block in new config.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1471 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--data/example_new.conf7
-rw-r--r--src/config.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/data/example_new.conf b/data/example_new.conf
index e3f78a196..7762592b4 100644
--- a/data/example_new.conf
+++ b/data/example_new.conf
@@ -684,4 +684,11 @@ operserv
* executable. If not given, defaults to "exception.db".
*/
exceptiondatabase = "exception.db"
+
+ /*
+ * The filename of OperServ's Autokill database. The path is relative to the services
+ * executable. If not given, defaults to "akill.db". OperServ no longer uses this file, and
+ * this directive is only provided for importing an old OperServ database.
+ */
+ #autokilldatabase = "akill.db"
}
diff --git a/src/config.c b/src/config.c
index 1c582d691..c8a640d50 100644
--- a/src/config.c
+++ b/src/config.c
@@ -643,6 +643,7 @@ int ServerConfig::Read(bool bail)
{"operserv", "database", "oper.db", new ValueContainerChar(&OperDBName), DT_CHARPTR, ValidateNotEmpty},
{"operserv", "newsdatabase", "news.db", new ValueContainerChar(&NewsDBName), DT_CHARPTR, ValidateNotEmpty},
{"operserv", "exceptiondatabase", "exception.db", new ValueContainerChar(&ExceptionDBName), DT_CHARPTR, ValidateNotEmpty},
+ {"operserv", "autokilldatabase", "akill.db", new ValueContainerChar(&AutokillDBName), DT_CHARPTR, ValidateNotEmpty},
{NULL, NULL, NULL, NULL, DT_NOTHING, NoValidation}
};
/* These tags can occur multiple times, and therefore they have special code to read them
@@ -1217,7 +1218,6 @@ bool ValueItem::GetBool()
Directive directives[] = {
{"AkillOnAdd", {{PARAM_SET, PARAM_RELOAD, &AkillOnAdd}}},
- {"AutokillDB", {{PARAM_STRING, PARAM_RELOAD, &AutokillDBName}}},
{"AutokillExpiry", {{PARAM_TIME, PARAM_RELOAD, &AutokillExpiry}}},
{"ChankillExpiry", {{PARAM_TIME, PARAM_RELOAD, &ChankillExpiry}}},
{"BadPassLimit", {{PARAM_POSINT, PARAM_RELOAD, &BadPassLimit}}},