BUILD : 1.7.17 (1185) BUGS : N/A NOTES : Encryption now offers the choice of none, old and md5 - the md5 module is nicely taken from irc-services and actaully works, yes, real md5, in anope, wow eh?

git-svn-id: svn://svn.anope.org/anope/trunk@1185 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@905 5417fbe8-f217-4b02-8779-1006273d7864

1 files changed, 1 insertions, 19 deletions

diff --git a/src/chanserv.c b/src/chanserv.c
index 1b05f8202..908cb1e69 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -496,25 +496,7 @@ void load_cs_dbase(void)
             SAFE(read_int32(&tmp32, f));
             ci->last_topic_time = tmp32;
             SAFE(read_int32(&ci->flags, f));
-#ifdef USE_ENCRYPTION
-            if (!(ci->flags & (CI_ENCRYPTEDPW | CI_VERBOTEN))) {
-                if (debug)
-                    alog("debug: %s: encrypting password for %s on load",
-                         s_ChanServ, ci->name);
-                if (encrypt_in_place(ci->founderpass, PASSMAX) < 0)
-                    fatal("%s: load database: Can't encrypt %s password!",
-                          s_ChanServ, ci->name);
-                ci->flags |= CI_ENCRYPTEDPW;
-            }
-#else
-            if (ci->flags & CI_ENCRYPTEDPW) {
-                /* Bail: it makes no sense to continue with encrypted
-                 * passwords, since we won't be able to verify them */
-                fatal("%s: load database: password for %s encrypted "
-                      "but encryption disabled, aborting",
-                      s_ChanServ, ci->name);
-            }
-#endif
+
             /* Leaveops cleanup */
             if (ver <= 13 && (ci->flags & 0x00000020))
                 ci->flags &= ~0x00000020;