mirror of
https://github.com/anope/anope.git
synced 2026-06-26 07:56:39 +02:00
Started options block in new config, added encryption directive to it.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1700 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
@@ -211,6 +211,34 @@ networkinfo {
|
||||
nicklen = 31
|
||||
}
|
||||
|
||||
/*
|
||||
* [REQUIRED] Services Options
|
||||
*
|
||||
* This section contains various options which determine how Services will operate.
|
||||
*/
|
||||
options {
|
||||
/*
|
||||
* The encryption module to use when dealing with passwords. This determines how
|
||||
* the passwords are stored in the databases, and does not add any security as
|
||||
* far as transmitting passwords over the network goes.
|
||||
*
|
||||
* When using enc_none, passwords will be stored without encryption in plain
|
||||
* text, allowing for passwords to be recovered later. The other encryption modules
|
||||
* use one-way encryption, so the passwords can not be recovered later if those
|
||||
* are used.
|
||||
*
|
||||
* NOTE: enc_old is Anope's previous (broken) MD5 implementation, if your databases
|
||||
* were made using that module, continue to use it and do not use enc_md5.
|
||||
*
|
||||
* Supported:
|
||||
* - enc_none (plain text, no encryption)
|
||||
* - enc_old (old, broken MD5 encryption)
|
||||
* - enc_md5 (working MD5 encryption)
|
||||
* - enc_sha1 (SHA1 encryption)
|
||||
*/
|
||||
encryption = "enc_none"
|
||||
}
|
||||
|
||||
/*
|
||||
* [OPTIONAL] Mail Config
|
||||
*
|
||||
|
||||
+2
-4
@@ -566,7 +566,7 @@ int ServerConfig::Read(bool bail)
|
||||
{
|
||||
errstr.clear();
|
||||
// These tags MUST occur and must ONLY occur once in the config file
|
||||
static const char *Once[] = {"serverinfo", "networkinfo", "nickserv", "chanserv", "memoserv", "helpserv", "operserv", NULL};
|
||||
static const char *Once[] = {"serverinfo", "networkinfo", "options", "nickserv", "chanserv", "memoserv", "helpserv", "operserv", NULL};
|
||||
// These tags can occur ONCE or not at all
|
||||
InitialConfig Values[] = {
|
||||
/* The following comments are from CyberBotX to w00t as examples to use:
|
||||
@@ -634,6 +634,7 @@ int ServerConfig::Read(bool bail)
|
||||
{"networkinfo", "logbot", "no", new ValueContainerBool(&LogBot), DT_BOOLEAN, NoValidation},
|
||||
{"networkinfo", "networkname", "", new ValueContainerChar(&NetworkName), DT_CHARPTR, ValidateNotEmpty},
|
||||
{"networkinfo", "nicklen", "0", new ValueContainerInt(&NickLen), DT_INTEGER | DT_NORELOAD, ValidateNickLen},
|
||||
{"options", "encryption", "", new ValueContainerChar(&EncModule), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty},
|
||||
{"nickserv", "nick", "NickServ", new ValueContainerChar(&s_NickServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty},
|
||||
{"nickserv", "description", "Nickname Registration Service", new ValueContainerChar(&desc_NickServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty},
|
||||
{"nickserv", "database", "nick.db", new ValueContainerChar(&NickDBName), DT_CHARPTR, ValidateNotEmpty},
|
||||
@@ -1342,7 +1343,6 @@ Directive directives[] = {
|
||||
{"BadPassLimit", {{PARAM_POSINT, PARAM_RELOAD, &BadPassLimit}}},
|
||||
{"BadPassTimeout", {{PARAM_TIME, PARAM_RELOAD, &BadPassTimeout}}},
|
||||
{"DumpCore", {{PARAM_SET, 0, &DumpCore}}},
|
||||
{"EncModule", {{PARAM_STRING, 0, &EncModule}}},
|
||||
{"ExpireTimeout", {{PARAM_TIME, PARAM_RELOAD, &ExpireTimeout}}},
|
||||
{"ForceForbidReason", {{PARAM_SET, PARAM_RELOAD, &ForceForbidReason}}},
|
||||
{"KeepBackups", {{PARAM_INT, PARAM_RELOAD, &KeepBackups}}},
|
||||
@@ -1695,8 +1695,6 @@ int read_config(int reload)
|
||||
}
|
||||
}
|
||||
|
||||
CHECK(EncModule);
|
||||
|
||||
CHECK(UpdateTimeout);
|
||||
CHECK(ExpireTimeout);
|
||||
CHECK(ReadTimeout);
|
||||
|
||||
Reference in New Issue
Block a user