Rip out ns_access and related code.

This is wildly insecure and has been disabled by default for at
least a decade.

32 files changed, 41 insertions, 1104 deletions

diff --git a/data/anope.example.conf b/data/anope.example.conf
index 3333f178b..93ae9c317 100644
--- a/data/anope.example.conf
+++ b/data/anope.example.conf
@@ -766,9 +766,9 @@ log
  *  memoserv/info                 - Can see any information with /MEMOSERV INFO
  *  memoserv/set-limit            - Can set the limit of max stored memos on any user and channel
  *  memoserv/no-limit             - Can send memos through limits and throttles
- *  nickserv/access               - Can modify other users access and certificate lists
  *  nickserv/alist                - Can see the channel access list of other users
  *  nickserv/auspex               - Can see any information with /NICKSERV INFO
+ *  nickserv/cert                 - Can modify other certificate lists
  *  nickserv/confirm              - Can confirm other users nicknames
  *  nickserv/drop                 - Can drop other users nicks
  *  nickserv/recover              - Can recover other users nicks
@@ -789,10 +789,10 @@ log
  *
  *   nickserv/getemail         nickserv/suspend       nickserv/ajoin           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
- *   nickserv/saset/private    nickserv/saset/secure  nickserv/saset/url       nickserv/saset/noexpire
- *   nickserv/saset/keepmodes  nickserv/saset/neverop
+ *   nickserv/saset/autoop   nickserv/saset/display    nickserv/saset/email    nickserv/saset/greet
+ *   nickserv/saset/kill     nickserv/saset/keepmodes  nickserv/saset/language  nickserv/saset/message
+ *   nickserv/saset/neverop  nickserv/saset/noexpire   nickserv/saset/password  nickserv/saset/private
+ *   nickserv/saset/url
  *
  *   hostserv/set            hostserv/del           hostserv/list
  *
diff --git a/data/chanserv.example.conf b/data/chanserv.example.conf
index b4ad0aad8..d9b218da2 100644
--- a/data/chanserv.example.conf
+++ b/data/chanserv.example.conf
@@ -76,8 +76,6 @@ module
 	 *                     access level or superior
 	 * -     cs_private: Hide the channel from ChanServ's LIST command
 	 * -     restricted: Kick/ban users who are restricted from the channel
-	 * -      cs_secure: Enable channel security, requiring the user to be identified with NickServ in
-	 *                     order to be considered for being on the access list of the channel
 	 * -      secureops: Only allow operator status to be given if the user is on the access list
 	 * -  securefounder: Only allow the real founder of the channel to drop the channel, change its
 	 *                     password, or change the founder or successor
@@ -93,10 +91,10 @@ module
 	 *                   to be a registered nick, otherwise the channel will be dropped.
 	 * -           none: No defaults
 	 *
-	 * This directive is optional, if left blank, the options will default to keeptopic, peace, cs_secure,
+	 * This directive is optional, if left blank, the options will default to keeptopic, peace,
 	 * securefounder, and signkick. If you really want no defaults, use "none" by itself as the option.
 	 */
-	defaults = "keeptopic peace cs_secure securefounder signkick"
+	defaults = "keeptopic peace securefounder signkick"
 
 	/*
 	 * The maximum number of channels which may be registered to a single nickname.
diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf
index fee1003df..ddc9a8ca8 100644
--- a/data/nickserv.example.conf
+++ b/data/nickserv.example.conf
@@ -96,8 +96,6 @@ module
 	 *                    option and the killprotect option must be specified with this one
 	 * -    kill_immed: Kill nick immediately if not identified, this one overrides both the killprotect
 	 *                    and kill_quick options and the killprotect option must be specified with this one
-	 * -     ns_secure: Enable nickname security, requiring the nick's password before any operations
-	 *                    can be done on it
 	 * -    ns_private: Hide the nick from NickServ's LIST command
 	 * -    hide_email: Hide the nick's e-mail address from NickServ's INFO command
 	 * -     hide_mask: Hide the nick's last or current user@host from NickServ's INFO command
@@ -112,10 +110,10 @@ module
 	 *                  to be enabled as well
 	 * - ns_keep_modes: Enables keepmodes, which retains user modes across sessions
 	 *
-	 * This directive is optional, if left blank, the options will default to ns_secure, memo_signon, and
+	 * This directive is optional, if left blank, the options will default to memo_signon, and
 	 * memo_receive. If you really want no defaults, use "none" by itself as the option.
 	 */
-	defaults = "killprotect ns_secure ns_private hide_email hide_mask memo_signon memo_receive autoop"
+	defaults = "killprotect ns_private hide_email hide_mask memo_signon memo_receive autoop"
 
 	/*
 	 * The minimum length of time between consecutive uses of NickServ's REGISTER command. This
@@ -249,33 +247,6 @@ command_group
 command { service = "NickServ"; name = "HELP"; command = "generic/help"; }
 
 /*
- * ns_access
- *
- * Provides the command nickserv/access.
- *
- * Used for configuring what hosts have access to your account.
- */
-module
-{
-	name = "ns_access"
-
-	/*
-	 * The maximum number of entries allowed on a nickname's access list.
-	 * If not set, the default is 32. This number cannot be set to 0.
-	 */
-	accessmax = 32
-
-	/*
-	 * If set, Anope will add the usermask of registering users to the access list of their
-	 * newly created account. If not set, users will always have to identify to NickServ before
-	 * being recognized, unless they manually add an address to the access list of their account.
-	 * This directive is optional.
-	 */
-	addaccessonreg = no
-}
-command { service = "NickServ"; name = "ACCESS"; command = "nickserv/access"; }
-
-/*
  * ns_ajoin
  *
  * Provides the command nickserv/ajoin.
@@ -530,10 +501,9 @@ command { service = "NickServ"; name = "RESETPASS"; command = "nickserv/resetpas
  *   nickserv/set/kill, nickserv/saset/kill - Used for configuring nickname protection.
  *   nickserv/set/language, nickserv/saset/language - Used for configuring what language services use.
  *   nickserv/set/message, nickserv/saset/message - Used to configure how services send messages to you.
- *   nickserv/set/password, nickserv/saset/password  - Used for changing a users password.
- *   nickserv/set/secure, nickserv/saset/secure - Used for configuring whether a user can identify by simply being recognized by nickserv/access.
  *   nickserv/set/neverop, nickserv/saset/neverop - Used to configure whether a user can be added to access lists
  *   nickserv/saset/noexpire - Used for configuring noexpire, which prevents nicks from expiring.
+ *   nickserv/set/password, nickserv/saset/password  - Used for changing a users password.
  */
 module
 {
@@ -574,9 +544,6 @@ command { service = "NickServ"; name = "SASET MESSAGE"; command = "nickserv/sase
 command { service = "NickServ"; name = "SET PASSWORD"; command = "nickserv/set/password"; }
 command { service = "NickServ"; name = "SASET PASSWORD"; command = "nickserv/saset/password"; permission = "nickserv/saset/password"; }
 
-command { service = "NickServ"; name = "SET SECURE"; command = "nickserv/set/secure"; }
-command { service = "NickServ"; name = "SASET SECURE"; command = "nickserv/saset/secure"; permission = "nickserv/saset/secure"; }
-
 command { service = "NickServ"; name = "SET NEVEROP"; command = "nickserv/set/neverop"; }
 command { service = "NickServ"; name = "SASET NEVEROP"; command = "nickserv/saset/neverop"; permission = "nickserv/saset/neverop"; }
 
@@ -601,17 +568,6 @@ command { service = "NickServ"; name = "SASET URL"; command = "nickserv/saset/mi
 #command { service = "NickServ"; name = "SET MASTODON"; command = "nickserv/set/misc"; misc_description = _("Associate a Mastodon account with your account"); }
 #command { service = "NickServ"; name = "SASET MASTODON"; command = "nickserv/saset/misc"; misc_description = _("Associate a Mastodon account with this account"); permission = "nickserv/saset/mastodon"; group = "nickserv/admin"; }
 
-
-/*
- * ns_status
- *
- * Provides the nickserv/status command.
- *
- * Used to determine if a user is recognized or identified by services.
- */
-module { name = "ns_status" }
-command { service = "NickServ"; name = "STATUS"; command = "nickserv/status"; }
-
 /*
  * ns_suspend
  *
diff --git a/include/account.h b/include/account.h
index ea65af9d4..acc5a1624 100644
--- a/include/account.h
+++ b/include/account.h
@@ -122,9 +122,6 @@ public:
 	Anope::string email;
 	/* Locale name of the language of the user. Empty means default language */
 	Anope::string language;
-	/* Access list, contains user@host masks of users who get certain privileges based
-	 * on if NI_SECURE is set and what (if any) kill protection is enabled. */
-	std::vector<Anope::string> access;
 	MemoInfo memos;
 	std::map<Anope::string, Anope::string> last_modes;
 
@@ -165,61 +162,9 @@ public:
 	 */
 	virtual bool IsServicesOper() const;
 
-	/** Add an entry to the nick's access list
-	 *
-	 * @param entry The nick!ident@host entry to add to the access list
-	 *
-	 * Adds a new entry into the access list.
-	 */
-	void AddAccess(const Anope::string &entry);
-
-	/** Get an entry from the nick's access list by index
-	 *
-	 * @param entry Index in the access list vector to retrieve
-	 * @return The access list entry of the given index if within bounds, an empty string if the vector is empty or the index is out of bounds
-	 *
-	 * Retrieves an entry from the access list corresponding to the given index.
-	 */
-	Anope::string GetAccess(unsigned entry) const;
-
-	/** Get the number of entries on the access list for this account.
-	 */
-	unsigned GetAccessCount() const;
-
 	/** Retrieves the account id for this user */
 	uint64_t GetId();
 
-	/** Find an entry in the nick's access list
-	 *
-	 * @param entry The nick!ident@host entry to search for
-	 * @return True if the entry is found in the access list, false otherwise
-	 *
-	 * Search for an entry within the access list.
-	 */
-	bool FindAccess(const Anope::string &entry);
-
-	/** Erase an entry from the nick's access list
-	 *
-	 * @param entry The nick!ident@host entry to remove
-	 *
-	 * Removes the specified access list entry from the access list.
-	 */
-	void EraseAccess(const Anope::string &entry);
-
-	/** Clears the entire nick's access list
-	 *
-	 * Deletes all the memory allocated in the access list vector and then clears the vector.
-	 */
-	void ClearAccess();
-
-	/** Is the given user on this accounts access list?
-	 *
-	 * @param u The user
-	 *
-	 * @return true if the user is on the access list
-	 */
-	bool IsOnAccess(const User *u) const;
-
 	/** Finds an account
 	 * @param nick The account name to find
 	 * @return The account, if it exists
diff --git a/include/language.h b/include/language.h
index 49af506be..a0ca020d9 100644
--- a/include/language.h
+++ b/include/language.h
@@ -90,8 +90,6 @@ namespace Language
 #define UNKNOWN				_("<unknown>")
 #define NO_EXPIRE			_("does not expire")
 #define LIST_INCORRECT_RANGE		_("Incorrect range specified. The correct syntax is \002#\037from\037-\037to\037\002.")
-#define NICK_IS_REGISTERED		_("This nick is owned by someone else.  Please choose another.\n" \
-						"(If this is your nick, type \002%s%s IDENTIFY \037password\037\002.)")
 #define NICK_IS_SECURE			_("This nickname is registered and protected.  If it is your\n" \
 						"nick, type \002%s%s IDENTIFY \037password\037\002.  Otherwise,\n" \
 						"please choose a different nick.")
diff --git a/include/modules.h b/include/modules.h
index c1fd8d5a9..34e1d4467 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -777,23 +777,6 @@ public:
 	 */
 	virtual void OnChangeCoreDisplay(NickCore *nc, const Anope::string &newdisplay) { throw NotImplementedException(); }
 
-	/** called from NickCore::ClearAccess()
-	 * @param nc pointer to the NickCore
-	 */
-	virtual void OnNickClearAccess(NickCore *nc) { throw NotImplementedException(); }
-
-	/** Called when a user adds an entry to their access list
-	 * @param nc The nick
-	 * @param entry The entry
-	 */
-	virtual void OnNickAddAccess(NickCore *nc, const Anope::string &entry) { throw NotImplementedException(); }
-
-	/** Called from NickCore::EraseAccess()
-	 * @param nc pointer to the NickCore
-	 * @param entry The access mask
-	 */
-	virtual void OnNickEraseAccess(NickCore *nc, const Anope::string &entry) { throw NotImplementedException(); }
-
 	/** called from NickCore::ClearCert()
 	 * @param nc pointer to the NickCore
 	 */
@@ -1096,7 +1079,7 @@ enum Implementation
 	I_OnCreateChan, I_OnDelChan, I_OnChannelCreate, I_OnChannelDelete, I_OnAkickAdd, I_OnAkickDel, I_OnCheckKick,
 	I_OnChanInfo, I_OnCheckPriv, I_OnGroupCheckPriv, I_OnNickDrop, I_OnNickGroup, I_OnNickIdentify,
 	I_OnUserLogin, I_OnNickLogout, I_OnNickRegister, I_OnNickConfirm, I_OnNickSuspend, I_OnNickUnsuspended, I_OnDelNick, I_OnNickCoreCreate,
-	I_OnDelCore, I_OnChangeCoreDisplay, I_OnNickClearAccess, I_OnNickAddAccess, I_OnNickEraseAccess, I_OnNickClearCert,
+	I_OnDelCore, I_OnChangeCoreDisplay, I_OnNickClearCert,
 	I_OnNickAddCert, I_OnNickEraseCert, I_OnNickInfo, I_OnBotInfo, I_OnCheckAuthentication, I_OnNickUpdate,
 	I_OnFingerprint, I_OnUserAway, I_OnInvite, I_OnDeleteVhost, I_OnSetVhost, I_OnSetDisplayedHost, I_OnMemoSend, I_OnMemoDel,
 	I_OnChannelModeSet, I_OnChannelModeUnset, I_OnUserModeSet, I_OnUserModeUnset, I_OnChannelModeAdd, I_OnUserModeAdd,
diff --git a/include/users.h b/include/users.h
index 2cd71c240..4bf1c100f 100644
--- a/include/users.h
+++ b/include/users.h
@@ -44,8 +44,6 @@ protected:
 	Anope::string vident;
 	Anope::string ident;
 	Anope::string uid;
-	/* If the user is on the access list of the nick they're on */
-	bool on_access;
 	/* Map of user modes and the params this user has (if any) */
 	ModeList modes;
 	/* NickCore account the user is currently logged in as, if they are logged in */
@@ -223,12 +221,6 @@ public:
 	 */
 	bool IsIdentified(bool check_nick = false) const;
 
-	/** Check if the user is recognized for their nick (on the nicks access list)
-	 * @param check_secure Only returns true if the user has secure off
-	 * @return true or false
-	 */
-	bool IsRecognized(bool check_secure = true) const;
-
 	/** Check if the user is connected securely.
 	 * @return True if the user is connected securely; otherwise, false.
 	 */
diff --git a/language/anope.en_US.po b/language/anope.en_US.po
index 687bca46f..8fe37eb9b 100644
--- a/language/anope.en_US.po
+++ b/language/anope.en_US.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-22 16:34+0000\n"
-"PO-Revision-Date: 2024-02-22 16:35+0000\n"
+"POT-Creation-Date: 2024-02-29 16:12+0000\n"
+"PO-Revision-Date: 2024-02-29 16:13+0000\n"
 "Last-Translator: Sadie Powell <sadie@witchery.services>\n"
 "Language-Team: English\n"
 "Language: en_US\n"
@@ -47,10 +47,6 @@ msgid "%s added to %s bad words list."
 msgstr "%s added to %s bad words list."
 
 #, c-format
-msgid "%s added to %s's access list."
-msgstr "%s added to %s's access list."
-
-#, c-format
 msgid "%s added to %s's certificate list."
 msgstr "%s added to %s's certificate list."
 
@@ -187,10 +183,6 @@ msgid "%s deleted from %s bad words list."
 msgstr "%s deleted from %s bad words list."
 
 #, c-format
-msgid "%s deleted from %s's access list."
-msgstr "%s deleted from %s's access list."
-
-#, c-format
 msgid "%s deleted from %s's certificate list."
 msgstr "%s deleted from %s's certificate list."
 
@@ -347,10 +339,6 @@ msgid "%s not found on %s bad words list."
 msgstr "%s not found on %s bad words list."
 
 #, c-format
-msgid "%s not found on %s's access list."
-msgstr "%s not found on %s's access list."
-
-#, c-format
 msgid "%s not found on %s's certificate list."
 msgstr "%s not found on %s's certificate list."
 
@@ -1606,10 +1594,6 @@ msgid "%s!%s@%s (%s) added to the bot list."
 msgstr "%s!%s@%s (%s) added to the bot list."
 
 #, c-format
-msgid "%s's access list is empty."
-msgstr "%s's access list is empty."
-
-#, c-format
 msgid "%s's auto join list is empty."
 msgstr "%s's auto join list is empty."
 
@@ -1745,9 +1729,6 @@ msgstr "ADD [+expiry] mask limit reason"
 msgid "ADD [nickname] channel [key]"
 msgstr "ADD [nickname] channel [key]"
 
-msgid "ADD [nickname] mask"
-msgstr "ADD [nickname] mask"
-
 msgid "ADD [nickname] [fingerprint]"
 msgstr "ADD [nickname] [fingerprint]"
 
@@ -1822,9 +1803,6 @@ msgstr "Account"
 msgid "Account %s has already reached the maximum number of simultaneous logins (%u)."
 msgstr "Account %s has already reached the maximum number of simultaneous logins (%u)."
 
-msgid "Activate security features"
-msgstr "Activate security features"
-
 msgid "Activate the requested vHost for the given nick."
 msgstr "Activate the requested vHost for the given nick."
 
@@ -2628,7 +2606,7 @@ msgstr "Bot bans will no longer automatically expire."
 
 #, c-format
 msgid "Bot hosts may only be %zu characters long."
-msgstr ""
+msgstr "Bot hosts may only be %zu characters long."
 
 msgid "Bot hosts may only contain valid host characters."
 msgstr "Bot hosts may only contain valid host characters."
@@ -3195,9 +3173,6 @@ msgstr "DEL [nickname] channel"
 msgid "DEL [nickname] fingerprint"
 msgstr "DEL [nickname] fingerprint"
 
-msgid "DEL [nickname] mask"
-msgstr "DEL [nickname] mask"
-
 msgid "DEL {mask | entry-num | list | id}"
 msgstr "DEL {mask | entry-num | list | id}"
 
@@ -3672,17 +3647,6 @@ msgstr ""
 "and attempt to re-set them the next time you authenticate."
 
 msgid ""
-"Enables or disables security features for a\n"
-"channel. When SECURE is set, only users who have\n"
-"identified to services, and are not only recognized, will be\n"
-"given access to channels from account-based access entries."
-msgstr ""
-"Enables or disables security features for a\n"
-"channel. When SECURE is set, only users who have\n"
-"identified to services, and are not only recognized, will be\n"
-"given access to channels from account-based access entries."
-
-msgid ""
 "Enables or disables signed kicks for a\n"
 "channel.  When SIGNKICK is set, kicks issued with\n"
 "the KICK command will have the nick that used the\n"
@@ -4839,10 +4803,6 @@ msgstr "Manipulate the topic of the specified channel"
 msgid "Mask"
 msgstr "Mask"
 
-#, c-format
-msgid "Mask %s already present on %s's access list."
-msgstr "Mask %s already present on %s's access list."
-
 msgid "Mask must be in the form user@host."
 msgstr "Mask must be in the form user@host."
 
@@ -4933,48 +4893,6 @@ msgstr "Modes"
 msgid "Modes cleared on %s and the channel destroyed."
 msgstr "Modes cleared on %s and the channel destroyed."
 
-#, c-format
-msgid ""
-"Modifies or displays the access list for your nick.  This\n"
-"is the list of addresses which will be automatically\n"
-"recognized by %s as allowed to use the nick.  If\n"
-"you want to use the nick from a different address, you\n"
-"need to send an IDENTIFY command to make %s\n"
-"recognize you. Services Operators may provide a nick\n"
-"to modify other users' access lists.\n"
-" \n"
-"Examples:\n"
-" \n"
-"    ACCESS ADD anyone@*.bepeg.com\n"
-"        Allows access to user anyone from any machine in\n"
-"        the bepeg.com domain.\n"
-" \n"
-"    ACCESS DEL anyone@*.bepeg.com\n"
-"        Reverses the previous command.\n"
-" \n"
-"    ACCESS LIST\n"
-"        Displays the current access list."
-msgstr ""
-"Modifies or displays the access list for your nick.  This\n"
-"is the list of addresses which will be automatically\n"
-"recognized by %s as allowed to use the nick.  If\n"
-"you want to use the nick from a different address, you\n"
-"need to send an IDENTIFY command to make %s\n"
-"recognize you. Services Operators may provide a nick\n"
-"to modify other users' access lists.\n"
-" \n"
-"Examples:\n"
-" \n"
-"    ACCESS ADD anyone@*.bepeg.com\n"
-"        Allows access to user anyone from any machine in\n"
-"        the bepeg.com domain.\n"
-" \n"
-"    ACCESS DEL anyone@*.bepeg.com\n"
-"        Reverses the previous command.\n"
-" \n"
-"    ACCESS LIST\n"
-"        Displays the current access list."
-
 msgid ""
 "Modifies or displays the certificate list for your nick.\n"
 "If you connect to IRC and provide a client certificate with a\n"
@@ -4994,9 +4912,6 @@ msgstr ""
 msgid "Modify the list of %s users"
 msgstr "Modify the list of %s users"
 
-msgid "Modify the list of authorized addresses"
-msgstr "Modify the list of authorized addresses"
-
 msgid "Modify the list of privileged users"
 msgstr "Modify the list of privileged users"
 
@@ -5167,10 +5082,6 @@ msgid "Nickname %s may not be registered."
 msgstr "Nickname %s may not be registered."
 
 #, c-format
-msgid "Nickname %s registered under your user@host-mask: %s"
-msgstr "Nickname %s registered under your user@host-mask: %s"
-
-#, c-format
 msgid "Nickname %s registered."
 msgstr "Nickname %s registered."
 
@@ -5837,44 +5748,6 @@ msgstr "Returns the key of the given channel."
 msgid "Returns the matching accounts that used given email."
 msgstr "Returns the matching accounts that used given email."
 
-msgid "Returns the owner status of the given nickname"
-msgstr "Returns the owner status of the given nickname"
-
-msgid ""
-"Returns whether the user using the given nickname is\n"
-"recognized as the owner of the nickname. The response has\n"
-"this format:\n"
-" \n"
-"    nickname status-code account\n"
-" \n"
-"where nickname is the nickname sent with the command,\n"
-"status-code is one of the following, and account\n"
-"is the account they are logged in as.\n"
-" \n"
-"    0 - no such user online or nickname not registered\n"
-"    1 - user not recognized as nickname's owner\n"
-"    2 - user recognized as owner via access list only\n"
-"    3 - user recognized as owner via password identification\n"
-" \n"
-"If no nickname is given, your status will be returned."
-msgstr ""
-"Returns whether the user using the given nickname is\n"
-"recognized as the owner of the nickname. The response has\n"
-"this format:\n"
-" \n"
-"    nickname status-code account\n"
-" \n"
-"where nickname is the nickname sent with the command,\n"
-"status-code is one of the following, and account\n"
-"is the account they are logged in as.\n"
-" \n"
-"    0 - no such user online or nickname not registered\n"
-"    1 - user not recognized as nickname's owner\n"
-"    2 - user recognized as owner via access list only\n"
-"    3 - user recognized as owner via password identification\n"
-" \n"
-"If no nickname is given, your status will be returned."
-
 msgid "Reverses kicker"
 msgstr "Reverses kicker"
 
@@ -5930,28 +5803,9 @@ msgid "Secure ops option for %s is now on."
 msgstr "Secure ops option for %s is now on."
 
 #, c-format
-msgid "Secure option for %s is now off."
-msgstr "Secure option for %s is now off."
-
-#, c-format
-msgid "Secure option for %s is now on."
-msgstr "Secure option for %s is now on."
-
-#, c-format
-msgid "Secure option is now off for %s."
-msgstr "Secure option is now off for %s."
-
-#, c-format
-msgid "Secure option is now on for %s."
-msgstr "Secure option is now on for %s."
-
-#, c-format
 msgid "Secureops enforced on %s."
 msgstr "Secureops enforced on %s."
 
-msgid "Security"
-msgstr "Security"
-
 #, c-format
 msgid ""
 "See %s%s HELP %s for more information\n"
@@ -6680,10 +6534,6 @@ msgid "Sorry, nickname registration is temporarily disabled."
 msgstr "Sorry, nickname registration is temporarily disabled."
 
 #, c-format
-msgid "Sorry, the maximum of %d access entries has been reached."
-msgstr "Sorry, the maximum of %d access entries has been reached."
-
-#, c-format
 msgid "Sorry, the maximum of %d auto join entries has been reached."
 msgstr "Sorry, the maximum of %d auto join entries has been reached."
 
@@ -6972,7 +6822,7 @@ msgid ""
 " \n"
 "Sets read-only mode on or off.  In read-only mode, normal\n"
 "users will not be allowed to modify any services data,\n"
-"including channel and nickname access lists, etc.  IRCops\n"
+"including channel access lists, etc.  Server operators\n"
 "with sufficient services privileges will be able to modify\n"
 "Services' AKILL, SQLINE, SNLINE and ignore lists, drop,\n"
 "suspend or forbid nicknames and channels, and manage news,\n"
@@ -6987,7 +6837,7 @@ msgstr ""
 " \n"
 "Sets read-only mode on or off.  In read-only mode, normal\n"
 "users will not be allowed to modify any services data,\n"
-"including channel and nickname access lists, etc.  IRCops\n"
+"including channel access lists, etc.  Server operators\n"
 "with sufficient services privileges will be able to modify\n"
 "Services' AKILL, SQLINE, SNLINE and ignore lists, drop,\n"
 "suspend or forbid nicknames and channels, and manage news,\n"
@@ -7815,14 +7665,6 @@ msgid "This command will resend you the registration confirmation email."
 msgstr "This command will resend you the registration confirmation email."
 
 #, c-format
-msgid ""
-"This nick is owned by someone else.  Please choose another.\n"
-"(If this is your nick, type %s%s IDENTIFY password.)"
-msgstr ""
-"This nick is owned by someone else.  Please choose another.\n"
-"(If this is your nick, type %s%s IDENTIFY password.)"
-
-#, c-format
 msgid "This nickname has been forbidden: %s"
 msgstr "This nickname has been forbidden: %s"
 
@@ -7917,9 +7759,6 @@ msgstr "Turn caps lock OFF!"
 msgid "Turn chanstats statistics on or off"
 msgstr "Turn chanstats statistics on or off"
 
-msgid "Turn nickname security on or off"
-msgstr "Turn nickname security on or off"
-
 msgid "Turn protection on or off"
 msgstr "Turn protection on or off"
 
@@ -7951,24 +7790,6 @@ msgstr ""
 "(However, anyone who knows your nickname can still get\n"
 "information on it using the INFO command.)"
 
-#, c-format
-msgid ""
-"Turns %s's security features on or off for your\n"
-"nick. With SECURE set, you must enter your password\n"
-"before you will be recognized as the owner of the nick,\n"
-"regardless of whether your address is on the access\n"
-"list. However, if you are on the access list, %s\n"
-"will not auto-kill you regardless of the setting of the\n"
-"KILL option."
-msgstr ""
-"Turns %s's security features on or off for your\n"
-"nick. With SECURE set, you must enter your password\n"
-"before you will be recognized as the owner of the nick,\n"
-"regardless of whether your address is on the access\n"
-"list. However, if you are on the access list, %s\n"
-"will not auto-kill you regardless of the setting of the\n"
-"KILL option."
-
 msgid "Turns chanstats channel statistics ON or OFF for this user."
 msgstr "Turns chanstats channel statistics ON or OFF for this user."
 
@@ -8594,9 +8415,6 @@ msgstr "You may not drop other Services Operators' nicknames."
 msgid "You may not suspend other Services Operators' nicknames."
 msgstr "You may not suspend other Services Operators' nicknames."
 
-msgid "You may view but not modify the access list of other Services Operators."
-msgstr "You may view but not modify the access list of other Services Operators."
-
 msgid "You may view but not modify the certificate list of other Services Operators."
 msgstr "You may view but not modify the certificate list of other Services Operators."
 
diff --git a/modules/chanserv/chanserv.cpp b/modules/chanserv/chanserv.cpp
index 3b1351c25..e00ecf05b 100644
--- a/modules/chanserv/chanserv.cpp
+++ b/modules/chanserv/chanserv.cpp
@@ -116,12 +116,11 @@ public:
 
 		ChanServ = bi;
 
-		spacesepstream(conf->GetModule(this)->Get<const Anope::string>("defaults", "keeptopic peace cs_secure securefounder signkick")).GetTokens(defaults);
+		spacesepstream(conf->GetModule(this)->Get<const Anope::string>("defaults", "keeptopic peace securefounder signkick")).GetTokens(defaults);
 		if (defaults.empty())
 		{
 			defaults.emplace_back("KEEPTOPIC");
 			defaults.emplace_back("PEACE");
-			defaults.emplace_back("CS_SECURE");
 			defaults.emplace_back("SECUREFOUNDER");
 			defaults.emplace_back("SIGNKICK");
 		}
diff --git a/modules/chanserv/cs_clone.cpp b/modules/chanserv/cs_clone.cpp
index 5b088154d..3e4d9bc81 100644
--- a/