Allow modules to use the encryption modules to encrypt arbitrary things.

Made enc_old depend on enc_md5.
Allow not loading any encryption modules if you want to only use an
external mechanism.
Removed ns_sendpass since it's just a bad idea.

2 files changed, 17 insertions, 24 deletions

diff --git a/data/example.conf b/data/example.conf
index 7bf1ea6ec..d1fc98087 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -1174,18 +1174,26 @@ db_sql
 }
 
 /*
- * [REQUIRED] Encryption modules.
+ * [RECOMMENDED] Encryption modules.
  *
  * The encryption modules are used when dealing with passwords. This determines how
  * the passwords are stored in the databases, and does not add any security as
  * far as transmitting passwords over the network goes.
  * 
- * Without any encryption modules, passwords will be stored in plain text, allowing
+ * Without any encryption modules loaded users will not be able to authenticate unless
+ * there is another module loaded that provides authentication checking, such as
+ * m_ldap_authentication or m_sql_authentication.
+ *
+ * With enc_none, passwords will be stored in plain text, allowing
  * for passwords to be recovered later but isn't secure therefore is not recommended. 
  * 
  * The other encryption modules use one-way encryption, so the passwords can not 
  * be recovered later if those are used.
  *
+ * The first encryption module loaded is the primary encryption module. All new passwords are
+ * encrypted by this module. Old passwords stored in another encryption method are
+ * automatically re-encrypted by the primary encryption module on next identify.
+ *
  * NOTE: enc_old is Anope's previous (broken) MD5 implementation, if your databases
  * were made using that module, continue to use it and do not use enc_md5.
  *
@@ -1196,24 +1204,21 @@ db_sql
  * that you first try to get everyone's passwords converted to enc_sha256 before
  * switching OSes by placing enc_sha256 at the beginning of the list.
  *
- * The first encryption module loaded is the primary encryption module. All new passwords are
- * encrypted by this module. Old passwords stored in another encryption method are
- * automatically re-encrypted by the primary encryption module on next identify.
  */
-module { name = "enc_md5" }
+
+module { name = "enc_sha256" }
+#module { name = "enc_md5" }
 #module { name = "enc_sha1" }
-#module { name = "enc_sha256" }
 
 /*
- * When using enc_none, passwords will be stored without encryption in plain
- * text, allowing for passwords to be recovered later. This isn't secure therefore
- * is not recommended.
+ * When using enc_none, passwords will be stored without encryption. This isn't secure
+ * therefore it is not recommended. 
  */
 #module { name = "enc_none" }
 
 /*
- * enc_old is Anope's previous (broken) MD5 implementation, if your databases
- * were made using that module, load it here to allow conversion to the primary
+ * enc_old is Anope's previous (broken) MD5 implementation used from 1.4.x to 1.7.16.
+ * If your databases were made using that module, load it here to allow conversion to the primary
  * encryption method.
  */
 #module { name = "enc_old" }
diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf
index 5c8b3f82e..fd624d24a 100644
--- a/data/nickserv.example.conf
+++ b/data/nickserv.example.conf
@@ -604,18 +604,6 @@ command { service = "NickServ"; name = "SET SECURE"; command = "nickserv/set/sec
 command { service = "NickServ"; name = "SASET SECURE"; command = "nickserv/saset/secure"; permission = "nickserv/saset/secure"; }
 
 /*
- * ns_sendpass
- *
- * Provides the command nickserv/sendpass.
- *
- * Used to send users their password via email.
- *
- * Requires that no encryption is being used.
- */
-module { name = "ns_sendpass" }
-command { service = "NickServ"; name = "SENDPASS"; command = "nickserv/sendpass"; permission = "nickserv/sendpass"; }
-
-/*
  * ns_set_misc
  *
  * Provides the command nickserv/set/misc.