/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: 2008-08-17 06:01:58 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080817060158-o5xakkih6t3br9yq
* Makefile (GNUTLS_CFLAGS, GNUTLS_LIBS, AVAHI_CFLAGS, AVAHI_LIBS,
            GPGME_CFLAGS, GPGME_LIBS): New; use libgnutls-config,
                                       pkg-config, and gpgme-config to
                                       get the correct compiler and
                                       linker flags.
  (MANPOST): New post-processing stage to man pages to fix a bug with
             having "\n" in the DocBook pages.
  (objects): Use $(addsuffix) instead of a for loop in a subshell.
  (plugin-runner, plugins.d/password-prompt): Removed; targets no
                                              longer necessary.
  (.PHONY): Added "doc".

* mandos.xml: Much improved.

* plugins.d/password-request.xml: Improved SEE ALSO section.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-keygen
70
70
        -n|--name) KEYNAME="$2"; shift 2;;
71
71
        -e|--email) KEYEMAIL="$2"; shift 2;;
72
72
        -c|--comment) KEYCOMMENT="$2"; shift 2;;
73
 
        -x|--expire) KEYEXPIRE="$2"; shift 2;;
 
73
        -x|--expire) KEYCOMMENT="$2"; shift 2;;
74
74
        -f|--force) FORCE=yes; shift;;
75
75
        -v|--version) echo "$0 $VERSION"; exit;;
76
76
        -h|--help) help; exit;;
188
188
 
189
189
# Export keys from key rings to key files
190
190
gpg --no-random-seed-file --quiet --batch --no-tty --armor \
191
 
    --no-default-keyring --no-options --secret-keyring "$SECRING" \
 
191
    --no-default-keyring --secret-keyring "$SECRING" \
192
192
    --keyring "$PUBRING" --export-options export-minimal \
193
193
    --comment "$FILECOMMENT" --output "$SECKEYFILE" \
194
194
    --export-secret-keys
195
195
gpg --no-random-seed-file --quiet --batch --no-tty --armor \
196
 
    --no-default-keyring --no-options --secret-keyring "$SECRING" \
 
196
    --no-default-keyring --secret-keyring "$SECRING" \
197
197
    --keyring "$PUBRING" --export-options export-minimal \
198
198
    --comment "$FILECOMMENT" --output "$PUBKEYFILE" \
199
199
    --export