diff options
| -rw-r--r-- | data/example_new.conf | 7 | ||||
| -rw-r--r-- | include/extern.h | 2 | ||||
| -rw-r--r-- | src/config.c | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/data/example_new.conf b/data/example_new.conf index 916ba286a..df914b406 100644 --- a/data/example_new.conf +++ b/data/example_new.conf @@ -268,6 +268,13 @@ mail * it is highly recommended that it be used. */ delay = 5m + + /* + * If set, Services will not attempt to put quotes around the TO: fields + * in e-mails. This directive is optional, and as far as we know, it's + * only needed if you are using ESMTP or QMail to send out e-mails. + */ + #dontquoteaddresses = yes } /* diff --git a/include/extern.h b/include/extern.h index 99f049200..3a1cb8cf5 100644 --- a/include/extern.h +++ b/include/extern.h @@ -315,7 +315,7 @@ E char *SendMailPath; E char *SendFrom; E bool RestrictMail; E time_t MailDelay; -E int DontQuoteAddresses; +E bool DontQuoteAddresses; E int NSDefFlags; E int NSDefLanguage; diff --git a/src/config.c b/src/config.c index d09f089fc..566e62728 100644 --- a/src/config.c +++ b/src/config.c @@ -110,7 +110,7 @@ char *SendMailPath; char *SendFrom; bool RestrictMail; time_t MailDelay; -int DontQuoteAddresses; +bool DontQuoteAddresses; static std::string NSDefaults; char *NSGuestNickPrefix; @@ -667,6 +667,7 @@ int ServerConfig::Read(bool bail) {"mail", "sendfrom", "", new ValueContainerChar(&SendFrom), DT_CHARPTR, ValidateMail}, {"mail", "restrict", "no", new ValueContainerBool(&RestrictMail), DT_BOOLEAN, NoValidation}, {"mail", "delay", "0", new ValueContainerTime(&MailDelay), DT_TIME, NoValidation}, + {"mail", "dontquoteaddresses", "no", new ValueContainerBool(&DontQuoteAddresses), DT_BOOLEAN, 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}, @@ -1331,8 +1332,6 @@ bool ValueItem::GetBool() Directive directives[] = { {"BadPassLimit", {{PARAM_POSINT, PARAM_RELOAD, &BadPassLimit}}}, {"BadPassTimeout", {{PARAM_TIME, PARAM_RELOAD, &BadPassTimeout}}}, - {"DontQuoteAddresses", - {{PARAM_SET, PARAM_RELOAD, &DontQuoteAddresses}}}, {"DumpCore", {{PARAM_SET, 0, &DumpCore}}}, {"EncModule", {{PARAM_STRING, 0, &EncModule}}}, {"ExpireTimeout", {{PARAM_TIME, PARAM_RELOAD, &ExpireTimeout}}}, |