diff options
author | mh <mh@immerda.ch> | 2014-06-27 18:46:34 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2014-06-27 18:46:34 +0200 |
commit | 1b659be814c25a0060b766c56a6f513a4f9ae9bf (patch) | |
tree | 4a1e47966fb7f4ef075171a311555cc8163aaafc | |
parent | 8b23bf2d85c3c7a86ca63b9d58d4f2fd0e131fa9 (diff) | |
parent | cc2b09eb2a24f71d5ec29860f182588b32a254a6 (diff) |
Merge branch 'safechars' of https://github.com/asquelt/trocla into asquelt-safechars
Conflicts:
lib/trocla.rb
-rw-r--r-- | lib/trocla.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/trocla.rb b/lib/trocla.rb index 7755149..74825aa 100644 --- a/lib/trocla.rb +++ b/lib/trocla.rb @@ -22,7 +22,7 @@ class Trocla plain_pwd = get_password(key,'plain') if options['random'] && plain_pwd.nil? - plain_pwd = Trocla::Util.random_str(options['length'],options['shellsafe']) + plain_pwd = Trocla::Util.random_str(options['length'].to_i,options['shellsafe']) set_password(key,'plain',plain_pwd) unless format == 'plain' elsif !options['random'] && plain_pwd.nil? raise "Password must be present as plaintext if you don't want a random password" |