diff options
author | Michael Kaye <1917473+michaelkaye@users.noreply.github.com> | 2018-05-08 20:51:27 +0100 |
---|---|---|
committer | Michael Kaye <1917473+michaelkaye@users.noreply.github.com> | 2018-05-08 20:51:27 +0100 |
commit | 24a90d0c00df7f544113eea0b1da79e00449ad65 (patch) | |
tree | 46063aefc40386a1256584b03d71ebaada6601f4 | |
parent | missing word :| (diff) | |
download | synapse-github/michaelkaye/make_hash_password_clearer.tar.xz |
This caught me out. Adding a warning. github/michaelkaye/make_hash_password_clearer michaelkaye/make_hash_password_clearer
-rwxr-xr-x | scripts/hash_password | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/hash_password b/scripts/hash_password index 215ab25cfe..4a2218ec5d 100755 --- a/scripts/hash_password +++ b/scripts/hash_password @@ -46,6 +46,9 @@ if __name__ == "__main__": bcrypt_rounds = config.get("bcrypt_rounds", bcrypt_rounds) password_config = config.get("password_config", {}) password_pepper = password_config.get("pepper", password_pepper) + else: + print "Warning: no config file passed with -c flag on commandline. The pepper and bcrypt_rounds configuration options may not be what you expect" + password = args.password if not password: |