summaryrefslogtreecommitdiff
path: root/src/config.c
diff options
context:
space:
mode:
authorrburchell <rburchell@5417fbe8-f217-4b02-8779-1006273d7864>2008-11-16 00:56:47 +0000
committerrburchell <rburchell@5417fbe8-f217-4b02-8779-1006273d7864>2008-11-16 00:56:47 +0000
commit61f2ce9a41acc6016b24da58005f9b779017d7d2 (patch)
tree3061017a7ac717abbd9c6e85c4741b5162afbf2b /src/config.c
parent01806ba86146730cf404daef624ee5208fc2e056 (diff)
Enable SVSHOLD for Insp1.1/1.2, remove UseSVSHOLD. Enforcer support may go away, as it is hacky, and no longer used with any of the ircds.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1739 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/config.c')
-rw-r--r--src/config.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/config.c b/src/config.c
index 7f741d60e..0cac86802 100644
--- a/src/config.c
+++ b/src/config.c
@@ -102,7 +102,6 @@ bool UseStrictPrivMsg;
bool DumpCore;
bool LogUsers;
int NickRegDelay;
-int UseSVSHOLD;
int NewsCount;
bool UseMail;
@@ -1391,13 +1390,10 @@ Directive directives[] = {
{"RemoteServer3", {{PARAM_STRING, 0, &RemoteServer3},
{PARAM_PORT, 0, &RemotePort3},
{PARAM_STRING, 0, &RemotePassword3}}},
- {"UseSVSHOLD", {{PARAM_SET, PARAM_RELOAD, &UseSVSHOLD}}},
+ {"RestrictOperNicks", {{PARAM_SET, PARAM_RELOAD, &RestrictOperNicks}}},
+ {"AnonymousGlobal", {{PARAM_SET, PARAM_RELOAD, &AnonymousGlobal}}},
{"UseTS6", {{PARAM_SET, 0, &UseTS6}}},
-<<<<<<< HEAD:src/config.c
- {"UnRestrictSAdmin", {{PARAM_SET, PARAM_RELOAD, &UnRestrictSAdmin}}},
-=======
{"UlineServers", {{PARAM_STRING, PARAM_RELOAD, &UlineServers}}},
->>>>>>> Remove UnRestrictSAdmin.:src/config.c
};
/*************************************************************************/