From a07fd592cba683025a07187e07e31e1d55fcd199 Mon Sep 17 00:00:00 2001 From: rburchell Date: Sat, 28 Feb 2009 00:50:04 +0000 Subject: [PATCH] Remove CSRestrictGetPass, it is unneeded with the introduction of opertypes. [Adam] git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2136 5417fbe8-f217-4b02-8779-1006273d7864 --- data/example.conf | 6 ------ src/config.c | 2 -- src/core/cs_getpass.c | 5 ----- 3 files changed, 13 deletions(-) diff --git a/data/example.conf b/data/example.conf index 2e955200c..b5d77c0a0 100644 --- a/data/example.conf +++ b/data/example.conf @@ -872,12 +872,6 @@ chanserv */ listmax = 50 - /* - * If set, Services will only allow Services Root(s) to use the ChanServ GETPASS command on a - * channel. This directive is optional. - */ - #restrictgetpass = yes - /* * Allow only IRC Operators to use ChanServ. This directive is optional. */ diff --git a/src/config.c b/src/config.c index 60847e116..ebfefd807 100644 --- a/src/config.c +++ b/src/config.c @@ -133,7 +133,6 @@ char *CSAutokickReason; time_t CSInhabit; bool CSListOpersOnly; unsigned CSListMax; -bool CSRestrictGetPass; bool CSOpersOnly; unsigned MSMaxMemos; @@ -871,7 +870,6 @@ int ServerConfig::Read(bool bail) {"chanserv", "inhabit", "0", new ValueContainerTime(&CSInhabit), DT_TIME, ValidateNotZero}, {"chanserv", "listopersonly", "no", new ValueContainerBool(&CSListOpersOnly), DT_BOOLEAN, NoValidation}, {"chanserv", "listmax", "0", new ValueContainerUInt(&CSListMax), DT_UINTEGER, ValidateNotZero}, - {"chanserv", "restrictgetpass", "no", new ValueContainerBool(&CSRestrictGetPass), DT_BOOLEAN, NoValidation}, {"chanserv", "opersonly", "no", new ValueContainerBool(&CSOpersOnly), DT_BOOLEAN, NoValidation}, {"memoserv", "nick", "MemoServ", new ValueContainerChar(&s_MemoServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, {"memoserv", "description", "Memo Service", new ValueContainerChar(&desc_MemoServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, diff --git a/src/core/cs_getpass.c b/src/core/cs_getpass.c index 689342223..c26d4a349 100644 --- a/src/core/cs_getpass.c +++ b/src/core/cs_getpass.c @@ -55,11 +55,6 @@ class CommandCSGetPass : public Command notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan); return MOD_CONT; } - if (CSRestrictGetPass && !is_services_root(u)) - { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); - return MOD_CONT; - } if(!enc_decrypt(ci->founderpass, tmp_pass, PASSMAX - 1)==1) { notice_lang(s_ChanServ, u, CHAN_GETPASS_UNAVAILABLE);