diff options
| author | Adam <Adam@anope.org> | 2014-03-09 08:34:34 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2014-03-09 10:07:13 -0400 |
| commit | 1a1a781b72d7920be44ffdbf582057279fe8125e (patch) | |
| tree | 376b6b44725f6937b297e63343bde9e0d12c1155 | |
| parent | 4b5ce8a9728db477b75766a60aec48981eff0750 (diff) | |
Remove mail:restrict as it is no longer useful. Changes nickserv/resetpass default to allow normal users to use it.
| -rw-r--r-- | data/example.conf | 16 | ||||
| -rw-r--r-- | docs/Changes.conf | 1 | ||||
| -rw-r--r-- | modules/commands/ns_resetpass.cpp | 4 |
3 files changed, 4 insertions, 17 deletions
diff --git a/data/example.conf b/data/example.conf index 5ccb4539b..9ffedac1f 100644 --- a/data/example.conf +++ b/data/example.conf @@ -780,7 +780,7 @@ log * memoserv/sendall memoserv/staff * * nickserv/getpass nickserv/getemail nickserv/suspend nickserv/ajoin - * nickserv/resetpass nickserv/list + * nickserv/list * * nickserv/saset/autoop nickserv/saset/email nickserv/saset/greet nickserv/saset/password * nickserv/saset/display nickserv/saset/kill nickserv/saset/language nickserv/saset/message @@ -826,7 +826,7 @@ opertype inherits = "Helper, Another Helper" /* What commands (see above) this opertype may use */ - commands = "chanserv/list chanserv/suspend chanserv/topic memoserv/staff nickserv/list nickserv/resetpass nickserv/suspend operserv/mode operserv/chankill operserv/akill operserv/session operserv/modinfo operserv/sqline operserv/oper operserv/kick operserv/ignore operserv/snline" + commands = "chanserv/list chanserv/suspend chanserv/topic memoserv/staff nickserv/list nickserv/suspend operserv/mode operserv/chankill operserv/akill operserv/session operserv/modinfo operserv/sqline operserv/oper operserv/kick operserv/ignore operserv/snline" /* What privs (see above) this opertype has */ privs = "chanserv/auspex chanserv/no-register-limit memoserv/* nickserv/auspex nickserv/confirm" @@ -953,18 +953,6 @@ mail sendfrom = "services@localhost.net" /* - * If set, RESETPASS will be restricted to services operators with access to - * nickserv/resetpass in their opertype:commands. - * This directive is optional. - * - * WARNING: If you choose to not enable this option, you should limit the - * number of processes that the services user can have at a time (you can - * create a special user for this; remember to NEVER launch Services as - * root). - */ - restrict = yes - - /* * This controls the minimum amount of time a user must wait before sending * another e-mail after they have sent one. It also controls the minimum time * a user must wait before they can receive another e-mail. diff --git a/docs/Changes.conf b/docs/Changes.conf index 8b41ad2be..82e36be6d 100644 --- a/docs/Changes.conf +++ b/docs/Changes.conf @@ -3,6 +3,7 @@ Anope Version 2.0.0 options:passlen, enforceruser, enforcerhost, releasetimeout, and guestnickprefix moved to nickserv's module configuration options:hideregisteredcommands added m_ssl renamed to m_ssl_openssl +mail:restrict removed Anope Version 1.9.9 ------------------- diff --git a/modules/commands/ns_resetpass.cpp b/modules/commands/ns_resetpass.cpp index a7d92b98e..c7c0302e7 100644 --- a/modules/commands/ns_resetpass.cpp +++ b/modules/commands/ns_resetpass.cpp @@ -27,9 +27,7 @@ class CommandNSResetPass : public Command { const NickAlias *na; - if (Config->GetBlock("mail")->Get<bool>("restrict") && !source.HasCommand("nickserv/resetpass")) - source.Reply(ACCESS_DENIED); - else if (!(na = NickAlias::Find(params[0]))) + if (!(na = NickAlias::Find(params[0]))) source.Reply(NICK_X_NOT_REGISTERED, params[0].c_str()); else if (!na->nc->email.equals_ci(params[1])) source.Reply(_("Incorrect email address.")); |