summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorAdam <adam@sigterm.info>2014-02-21 19:49:29 -0500
committerAdam <adam@sigterm.info>2014-02-21 19:49:29 -0500
commite3a8a45a61fc8d71f0c0b832a2162252da8bb55e (patch)
tree056534601f3d1cf1d62c02944863c395cf43f5f2 /data
parentf1ad7fd5820e2eee8f1c2c87da7b4d6a3781a874 (diff)
parentb6935e706cc29a05b827efaea6317885bfa2987b (diff)
Merge pull request #56 from ShutterQuick/2.0+noxcrypt
enc_bcrypt.cpp: Get rid of the libxcrypt dependency by including code fr...
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.