diff options
| author | Adam <Adam@anope.org> | 2014-01-26 01:03:43 -0500 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2014-01-26 01:03:43 -0500 |
| commit | e965bc3049030307d91b13cace96b7640a79d46e (patch) | |
| tree | c045d32bdbf303c7bd27a1bf940b1c8a6ac1b30f | |
| parent | 01780c9e7a92c6fc3c9c3a4733fad1808a3e462f (diff) | |
Revert "Rename db_old hash plain -> none which is what 1.8 calls it"
This reverts commit 9a9ca417500e3de64013583e3f6db8dd165d9a95.
| -rw-r--r-- | data/example.conf | 2 | ||||
| -rw-r--r-- | modules/database/db_old.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/example.conf b/data/example.conf index 3ab1e2d42..948700e8b 100644 --- a/data/example.conf +++ b/data/example.conf @@ -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. */ diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp index cc47e2abc..739fcaebe 100644 --- a/modules/database/db_old.cpp +++ b/modules/database/db_old.cpp @@ -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"); } |