diff options
| author | rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b <rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2006-10-17 20:42:40 +0000 |
|---|---|---|
| committer | rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b <rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2006-10-17 20:42:40 +0000 |
| commit | 9bf8366451b60148699657ed966c0913fbae9465 (patch) | |
| tree | 3a48a1aaa582ec259657ff1029dd691b3a99fb92 /src/nickserv.c | |
| parent | 3dbe219758f5c9712a5c1935d85be1434cf0eee8 (diff) | |
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
Diffstat (limited to 'src/nickserv.c')
| -rw-r--r-- | src/nickserv.c | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/src/nickserv.c b/src/nickserv.c index cb51c47b8..b863ba752 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -323,25 +323,7 @@ void load_old_ns_dbase(void) SAFE(read_int16(&na->status, f)); na->status &= ~NS_TEMPORARY; -#ifdef USE_ENCRYPTION - if (!(na->status & (NS_OLD_ENCRYPTEDPW | NS_VERBOTEN))) { - if (debug) - alog("debug: %s: encrypting password for `%s' on load", - s_NickServ, na->nick); - if (encrypt_in_place(bufp, PASSMAX) < 0) - fatal("%s: Can't encrypt `%s' nickname password!", - s_NickServ, na->nick); - na->status |= NS_OLD_ENCRYPTEDPW; - } -#else - if (na->status & NS_OLD_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_NickServ, na->nick); - } -#endif + if (ver >= 9) { SAFE(read_string(&forbidby, f)); SAFE(read_string(&forbidreason, f)); @@ -606,25 +588,6 @@ void load_ns_dbase(void) SAFE(read_int32(&nc->flags, f)); if (!NSAllowKillImmed) nc->flags &= ~NI_KILL_IMMED; -#ifdef USE_ENCRYPTION - if (nc->pass && !(nc->flags & NI_ENCRYPTEDPW)) { - if (debug) - alog("debug: %s: encrypting password for `%s' on load", - s_NickServ, nc->display); - if (encrypt_in_place(nc->pass, PASSMAX) < 0) - fatal("%s: Can't encrypt `%s' nickname password!", - s_NickServ, nc->display); - nc->flags |= NI_ENCRYPTEDPW; - } -#else - if (nc->flags & NI_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_NickServ, nc->display); - } -#endif SAFE(read_int16(&nc->language, f)); /* Add services opers and admins to the appropriate list, but |