/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-keygen

  • Committer: Teddy Hogeborn
  • Date: 2014-03-09 03:02:43 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 311.
  • Revision ID: teddy@recompile.se-20140309030243-0gc6l2yuqbzgyuyt
Use getnameinfo() instead of inet_ntop() in mandos-client.

* plugins.d/mandos-client.c (start_mandos_communication): Use
                                                          getnameinfo()
                                                          instead of
                                                          inet_ntop().

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-keygen
21
21
# Contact the authors at <mandos@recompile.se>.
22
22
# 
23
23
 
24
 
VERSION="1.6.1"
 
24
VERSION="1.6.4"
25
25
 
26
26
KEYDIR="/etc/keys/mandos"
27
27
KEYTYPE=RSA
30
30
SUBKEYLENGTH=4096
31
31
KEYNAME="`hostname --fqdn 2>/dev/null || hostname`"
32
32
KEYEMAIL=""
33
 
KEYCOMMENT="Mandos client key"
 
33
KEYCOMMENT=""
34
34
KEYEXPIRE=0
35
35
FORCE=no
36
36
KEYCOMMENT_ORIG="$KEYCOMMENT"
71
71
  -e ADDRESS, --email ADDRESS
72
72
                        Email address of key.  Default is empty.
73
73
  -c TEXT, --comment TEXT
74
 
                        Comment field for key.  The default value is
75
 
                        "Mandos client key".
 
74
                        Comment field for key.  The default is empty.
76
75
  -x TIME, --expire TIME
77
76
                        Key expire time.  Default is no expiration.
78
77
                        See gpg(1) for syntax.
229
228
        date
230
229
    fi
231
230
    
 
231
    # Make sure trustdb.gpg exists;
 
232
    # this is a workaround for Debian bug #737128
 
233
    gpg --quiet --batch --no-tty --no-options --enable-dsa2 \
 
234
        --homedir "$RINGDIR" \
 
235
        --import-ownertrust < /dev/null
232
236
    # Generate a new key in the key rings
233
237
    gpg --quiet --batch --no-tty --no-options --enable-dsa2 \
234
238
        --homedir "$RINGDIR" --trust-model always \
294
298
            cat "$PASSFILE"
295
299
        else
296
300
            tty --quiet && stty -echo
297
 
            echo -n "Enter passphrase: "
 
301
            echo -n "Enter passphrase: " >&2
298
302
            read first
299
303
            tty --quiet && echo >&2
300
 
            echo -n "Repeat passphrase: "
 
304
            echo -n "Repeat passphrase: " >&2
301
305
            read second
302
306
            if tty --quiet; then
303
307
                echo >&2