diff options
| author | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-11-15 21:49:07 +0000 |
|---|---|---|
| committer | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-11-15 21:49:07 +0000 |
| commit | 8131ca2c985cc817d7d071340ecb3340f83262d3 (patch) | |
| tree | 66c1714543eb115f652da2bc7751ca077c7d6df2 | |
| parent | 77c47e06a87a4731960d3f0ac9567857eb531994 (diff) | |
Added ulineservers directive to options block in new config.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1736 5417fbe8-f217-4b02-8779-1006273d7864
| -rw-r--r-- | data/example_new.conf | 9 | ||||
| -rw-r--r-- | include/extern.h | 1 | ||||
| -rw-r--r-- | src/config.c | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/data/example_new.conf b/data/example_new.conf index 8b8c78316..64273839c 100644 --- a/data/example_new.conf +++ b/data/example_new.conf @@ -460,6 +460,15 @@ options { * This directive is optional, if left out, defaults to 3. */ #newscount = 3 + + /* + * A space-separated list of ulined servers on your network, it is assumed that + * the servers in this list are allowed to set channel modes and Services will + * not attempt to reverse their mode changes. This directive is optional. + * + * WARNING: Do NOT put your user servers in this directive. + */ + ulineservers = "stats.your.network proxy.your.network" } /* diff --git a/include/extern.h b/include/extern.h index 581ffdbe7..5d2afe5c9 100644 --- a/include/extern.h +++ b/include/extern.h @@ -453,7 +453,6 @@ E char *ExceptionDBName; E char *SessionLimitDetailsLoc; E char *SessionLimitExceeded; -E char *UlineServers; E char **Ulines; E int NumUlines; diff --git a/src/config.c b/src/config.c index 32102ed1d..dd3242bd8 100644 --- a/src/config.c +++ b/src/config.c @@ -296,7 +296,7 @@ char *Numeric; int UnRestrictSAdmin; -char *UlineServers; +static char *UlineServers; char **Ulines; int NumUlines; @@ -673,6 +673,7 @@ int ServerConfig::Read(bool bail) {"options", "nickregdelay", "0", new ValueContainerInt(&NickRegDelay), DT_INTEGER, NoValidation}, {"options", "restrictopernicks", "no", new ValueContainerBool(&RestrictOperNicks), DT_BOOLEAN, NoValidation}, {"options", "newscount", "3", new ValueContainerInt(&NewsCount), DT_INTEGER, NoValidation}, + {"options", "ulineservers", "", new ValueContainerChar(&UlineServers), DT_CHARPTR, NoValidation}, {"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}, @@ -1405,7 +1406,6 @@ Directive directives[] = { {"UseSVSHOLD", {{PARAM_SET, PARAM_RELOAD, &UseSVSHOLD}}}, {"UseTS6", {{PARAM_SET, 0, &UseTS6}}}, {"UnRestrictSAdmin", {{PARAM_SET, PARAM_RELOAD, &UnRestrictSAdmin}}}, - {"UlineServers", {{PARAM_STRING, PARAM_RELOAD, &UlineServers}}}, }; /*************************************************************************/ |