summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorDaniel Vassdal <shutter@canternet.org>2014-02-17 18:49:44 -0800
committerDaniel Vassdal <shutter@canternet.org>2014-02-20 11:42:20 -0800
commitb6935e706cc29a05b827efaea6317885bfa2987b (patch)
tree72068ae943c1801c65bfd9730f91ec11fc5d61e1 /data
parent109d8f431f3d25d56570a6aaa1af957867bbb80e (diff)
enc_bcrypt.cpp: Get rid of the libxcrypt dependency by including code from libxcrypt, and move enc_bcrypt out of extras
Diffstat (limited to 'data')
-rw-r--r--data/example.conf1
-rw-r--r--data/modules.example.conf17
2 files changed, 1 insertions, 17 deletions
diff --git a/data/example.conf b/data/example.conf
index 4d4ba6b17..5ccb4539b 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -1217,6 +1217,7 @@ module
*
*/
+#module { name = "enc_bcrypt" }
module { name = "enc_sha256" }
#module { name = "enc_md5" }
#module { name = "enc_sha1" }
diff --git a/data/modules.example.conf b/data/modules.example.conf
index 30927433f..01e2760c2 100644
--- a/data/modules.example.conf
+++ b/data/modules.example.conf
@@ -10,23 +10,6 @@
*/
/*
- * enc_bcrypt [EXTRA]
- *
- * Adds the possibility to store passwords using bcrypt.
- * This follows the same rules as the other encryption modules,
- * eg. if you want it to be your primary encryption method it must
- * be loaded before any other encryption modules.
- * See the Encryption section of services.conf for more information.
- *
- * Requires libxcrypt.
- */
-#module
-{
- name = "enc_bcrypt"
- rounds = "10"
-}
-
-/*
* help
*
* Provides the command generic/help.