Remove recognized status and secure

Also remove /ns status, which is now almost useless with no recognized
status, and /ns access.

2 files changed, 4 insertions, 51 deletions

diff --git a/data/chanserv.example.conf b/data/chanserv.example.conf
index 22881217c..e19d67b90 100644
--- a/data/chanserv.example.conf
+++ b/data/chanserv.example.conf
@@ -67,8 +67,6 @@ module
 	 *                     access level or superior
 	 * -        private: Hide the channel from ChanServ's LIST command
 	 * -     restricted: Kick/ban users who are restricted from the channel
-	 * -         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 it's
 	 *                     password, or change the founder or successor
@@ -82,10 +80,10 @@ module
 	 *                     not in use.
 	 * -           none: No defaults
 	 *
-	 * This directive is optional, if left blank, the options will default to keeptopic, chanserv/secure, securefounder,
+	 * This directive is optional, if left blank, the options will default to keeptopic, securefounder,
 	 * and signkick. If you really want no defaults, use "none" by itself as the option.
 	 */
-	defaults = "keeptopic peace secure securefounder signkick"
+	defaults = "keeptopic peace securefounder signkick"
 
 	/*
 	 * The maximum number of channels which may be registered to a single nickname.
@@ -1123,7 +1121,6 @@ command { service = "OperServ"; name = "SEEN"; command = "operserv/seen"; permis
  *   chanserv/set/peace - Used for configuring if users are able to kick other users with higher access than them.
  *   chanserv/set/persist - Used for setting whether ChanServ should stay in channels after the last user leaves.
  *   chanserv/set/restricted - Used for setting whether users not on a channel's access list can join.
- *   chanserv/set/secure - Used for setting whether users who are recognized for accounts should have their access in channels.
  *   chanserv/set/securefounder - Used for setting whether users with founder level access in channels have true founder or not.
  *   chanserv/set/secureops - Used for restricting who can have channel op privilege in a channel to those whom have access in the channel.
  *   chanserv/set/signkick - Used for setting signkick, which appends the kicker's name to kicks sent through ChanServ.
@@ -1164,7 +1161,6 @@ command { service = "ChanServ"; name = "SET KEEPMODES"; command = "chanserv/set/
 command { service = "ChanServ"; name = "SET PEACE"; command = "chanserv/set/peace"; }
 command { service = "ChanServ"; name = "SET PERSIST"; command = "chanserv/set/persist"; }
 command { service = "ChanServ"; name = "SET RESTRICTED"; command = "chanserv/set/restricted"; }
-command { service = "ChanServ"; name = "SET SECURE"; command = "chanserv/set/secure"; }
 command { service = "ChanServ"; name = "SET SECUREFOUNDER"; command = "chanserv/set/securefounder"; }
 command { service = "ChanServ"; name = "SET SECUREOPS"; command = "chanserv/set/secureops"; }
 command { service = "ChanServ"; name = "SET SIGNKICK"; command = "chanserv/set/signkick"; }
diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf
index ceef600ab..5da993265 100644
--- a/data/nickserv.example.conf
+++ b/data/nickserv.example.conf
@@ -85,8 +85,6 @@ module
 	 * -   killprotect: Kill nick if not identified within 60 seconds
 	 * -     killquick: Kill nick if not identified within 20 seconds, this one overrides the above
 	 *                    option and the above must be specified with this one
-	 * -        secure: Enable nickname security, requiring the nick's password before any operations
-	 *                    can be done on it
 	 * -       private: Hide the nick from NickServ's LIST command
 	 * -    hide_email: Hide's the nick's e-mail address from NickServ's INFO command
 	 * -     hide_mask: Hide's the nick's last or current user@host from NickServ's INFO command
@@ -100,10 +98,10 @@ module
 	 * -     keepmodes: Enables keepmodes, which retains user modes across sessions
 	 * -      noexpire: Enables no expire. Unconfirmed expire overrules this.
 	 *
-	 * This directive is optional, if left blank, the options will default to nickserv/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 = "secure private hide_email hide_mask memo_signon memo_receive autoop"
+	defaults = "private hide_email hide_mask memo_signon memo_receive autoop"
 
 	/*
 	 * The minimum length of time between consecutive uses of NickServ's REGISTER command. This
@@ -230,33 +228,6 @@ command_group
 command { service = "NickServ"; name = "HELP"; command = "generic/help"; }
 
 /*
- * nickserv/access
- *
- * Provides the command nickserv/access.
- *
- * Used for configuring what hosts have access to your account.
- */
-module
-{
-	name = "nickserv/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, Services 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 = yes
-}
-command { service = "NickServ"; name = "ACCESS"; command = "nickserv/access"; }
-
-/*
  * nickserv/ajoin
  *
  * Provides the command nickserv/ajoin.
@@ -511,7 +482,6 @@ command { service = "NickServ"; name = "RESETPASS"; command = "nickserv/resetpas
  *   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/saset/noexpire - Used for configuring noexpire, which prevents nicks from expiring.
  */
 module
@@ -553,9 +523,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 = "SASET NOEXPIRE"; command = "nickserv/saset/noexpire"; permission = "nickserv/saset/noexpire"; }
 
 
@@ -578,16 +545,6 @@ command { service = "NickServ"; name = "SASET URL"; command = "nickserv/saset/mi
 #command { service = "NickServ"; name = "SASET FACEBOOK"; command = "nickserv/saset/misc"; misc_description = _("Associate a Facebook URL with this account"); permission = "nickserv/saset/facebook"; group = "nickserv/admin"; }
 
 /*
- * nickserv/status
- *
- * Provides the nickserv/status command.
- *
- * Used to determine if a user is recognized or identified by services.
- */
-module { name = "nickserv/status" }
-command { service = "NickServ"; name = "STATUS"; command = "nickserv/status"; }
-
-/*
  * nickserv/suspend
  *
  * Provides the commands nickserv/suspend and nickserv/unsuspend.