mirror of
https://github.com/anope/anope.git
synced 2026-06-26 08:56:39 +02:00
Added delay directive to mail block in new config.
Renamed restrictmail to restrict in mail block. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1625 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
+12
-1
@@ -256,7 +256,18 @@ mail
|
||||
* create a special user for this; remember to NEVER launch Services as
|
||||
* root).
|
||||
*/
|
||||
restrictmail = yes
|
||||
restrict = yes
|
||||
|
||||
/*
|
||||
* This controls the minimum amount of time an user must wait before sending
|
||||
* another e-mail after they have sent one. It also controls the minimum time
|
||||
* an user must wait before they can receive another e-mail. This directive
|
||||
* is optional, but recommended.
|
||||
*
|
||||
* This feature prevents users from being mail bombed using Services and
|
||||
* it is highly recommended that it be used.
|
||||
*/
|
||||
delay = 5m
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
+1
-1
@@ -314,7 +314,7 @@ E bool UseMail;
|
||||
E char *SendMailPath;
|
||||
E char *SendFrom;
|
||||
E bool RestrictMail;
|
||||
E int MailDelay;
|
||||
E time_t MailDelay;
|
||||
E int DontQuoteAddresses;
|
||||
|
||||
E int NSDefFlags;
|
||||
|
||||
+3
-3
@@ -109,7 +109,7 @@ bool UseMail;
|
||||
char *SendMailPath;
|
||||
char *SendFrom;
|
||||
bool RestrictMail;
|
||||
int MailDelay;
|
||||
time_t MailDelay;
|
||||
int DontQuoteAddresses;
|
||||
|
||||
static std::string NSDefaults;
|
||||
@@ -665,7 +665,8 @@ int ServerConfig::Read(bool bail)
|
||||
{"mail", "usemail", "no", new ValueContainerBool(&UseMail), DT_BOOLEAN, ValidateEmailReg},
|
||||
{"mail", "sendmailpath", "", new ValueContainerChar(&SendMailPath), DT_CHARPTR, ValidateMail},
|
||||
{"mail", "sendfrom", "", new ValueContainerChar(&SendFrom), DT_CHARPTR, ValidateMail},
|
||||
{"mail", "restrictmail", "no", new ValueContainerBool(&RestrictMail), DT_BOOLEAN, NoValidation},
|
||||
{"mail", "restrict", "no", new ValueContainerBool(&RestrictMail), DT_BOOLEAN, NoValidation},
|
||||
{"mail", "delay", "0", new ValueContainerTime(&MailDelay), DT_TIME, NoValidation},
|
||||
{"chanserv", "nick", "ChanServ", new ValueContainerChar(&s_ChanServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty},
|
||||
{"chanserv", "description", "Channel Registration Service", new ValueContainerChar(&desc_ChanServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty},
|
||||
{"chanserv", "database", "chan.db", new ValueContainerChar(&ChanDBName), DT_CHARPTR, ValidateNotEmpty},
|
||||
@@ -1341,7 +1342,6 @@ Directive directives[] = {
|
||||
{"LocalAddress", {{PARAM_STRING, 0, &LocalHost},
|
||||
{PARAM_PORT, PARAM_OPTIONAL, &LocalPort}}},
|
||||
{"LogUsers", {{PARAM_SET, PARAM_RELOAD, &LogUsers}}},
|
||||
{"MailDelay", {{PARAM_TIME, PARAM_RELOAD, &MailDelay}}},
|
||||
{"MysqlHost", {{PARAM_STRING, PARAM_RELOAD, &MysqlHost}}},
|
||||
{"MysqlUser", {{PARAM_STRING, PARAM_RELOAD, &MysqlUser}}},
|
||||
{"MysqlPass", {{PARAM_STRING, PARAM_RELOAD, &MysqlPass}}},
|
||||
|
||||
Reference in New Issue
Block a user