1
0
mirror of https://github.com/anope/anope.git synced 2026-07-05 20:53:13 +02:00

Revert "Rename db_old hash plain -> none which is what 1.8 calls it"

This reverts commit 9a9ca41750.
This commit is contained in:
Adam
2014-01-26 01:03:43 -05:00
parent 01780c9e7a
commit e965bc3049
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -1065,7 +1065,7 @@ mail
/*
* This is the encryption type used by the databases. This must be set correctly or
* your passwords will not work. Valid options are: md5, oldmd5, sha1, and none.
* your passwords will not work. Valid options are: md5, oldmd5, sha1, and plain.
* You must also be sure to load the correct encryption module below in the Encryption
* Modules section so that your passwords work.
*/
+2 -2
View File
@@ -441,7 +441,7 @@ static void LoadNicks()
char pwbuf[32];
READ(read_buffer(pwbuf, f));
if (hashm == "none")
if (hashm == "plain")
my_b64_encode(pwbuf, nc->pass);
else if (hashm == "md5" || hashm == "oldmd5")
nc->pass = Hex(pwbuf, 16);
@@ -1176,7 +1176,7 @@ class DBOld : public Module
hashm = Config->GetModule(this)->Get<const Anope::string>("hash");
if (hashm != "md5" && hashm != "oldmd5" && hashm != "sha1" && hashm != "none" && hashm != "sha256")
if (hashm != "md5" && hashm != "oldmd5" && hashm != "sha1" && hashm != "plain" && hashm != "sha256")
throw ModuleException("Invalid hash method");
}