/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: 2024-11-24 22:19:53 UTC
  • mfrom: (237.4.144 release)
  • Revision ID: teddy@recompile.se-20241124221953-qu9unqqbgi456wrx
Merge from release branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
23
23
# Contact the authors at <mandos@recompile.se>.
24
24
25
25
 
26
 
VERSION="1.8.17"
 
26
VERSION="1.8.18"
27
27
 
28
28
KEYDIR="/etc/keys/mandos"
29
29
KEYTYPE=RSA
437
437
            }
438
438
        }' < "$SECFILE"
439
439
    if [ -n "$ssh_fingerprint" ]; then
 
440
        if [ -n "$ssh_keyscan_quiet" ]; then
 
441
            echo "# Note: if the Mandos server has OpenSSH older than 9.8, the ${ssh_keyscan_quiet}"
 
442
            echo "# option *must* be removed from the 'checker' setting below"
 
443
        fi
440
444
        echo 'checker = ssh-keyscan '"$ssh_keyscan_quiet"'-t '"$ssh_keytype"' %%(host)s 2>/dev/null | grep --fixed-strings --line-regexp --quiet --regexp=%%(host)s" %(ssh_fingerprint)s"'
441
445
        echo "ssh_fingerprint = ${ssh_fingerprint}"
442
446
    fi