/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos-keygen

  • Committer: Teddy Hogeborn
  • Date: 2017-02-22 21:45:35 UTC
  • Revision ID: teddy@recompile.se-20170222214535-milf6w0b1krwpaex
Server bug fix: Use the mandos.conf "zeroconf" and "restore" options

Allow the "zeroconf" and "restore" options to actually work from the
mandos.conf file, in addition to command line options.

Closes: 855589
Reported-by: Pablo Abelenda <pabelenda@igalia.com>
Suggested-by: Pablo Abelenda <pabelenda@igalia.com>

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
# Contact the authors at <mandos@recompile.se>.
22
22
23
23
 
24
 
VERSION="1.7.13"
 
24
VERSION="1.7.14"
25
25
 
26
26
KEYDIR="/etc/keys/mandos"
27
27
KEYTYPE=RSA
326
326
        else
327
327
            tty --quiet && stty -echo
328
328
            echo -n "Enter passphrase: " >/dev/tty
329
 
            read first
 
329
            read -r first
330
330
            tty --quiet && echo >&2
331
331
            echo -n "Repeat passphrase: " >/dev/tty
332
 
            read second
 
332
            read -r second
333
333
            if tty --quiet; then
334
334
                echo >&2
335
335
                stty echo