/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-19 23:44:17 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080819234417-8dz5prw19ihrklx6
* Makefile (DOCBOOKTOMAN): Include all DocBook-to-manpage-related
                           commands here, and use it everywhere.
  (mandos.8, mandos.conf.5): New; also depend on "mandos-options.xml".

* mandos-keygen.xml: Removed OVERVIEW entity.  Add XInclude namespace.
  (OVERVIEW): Changed to do <xi:include/>.

* mandos-options.xml (<simplesect>): Changed to a <section>.
  ([@id="address"]): Reordered sentences.

* mandos.conf.xml (OPTIONS): Removed illegal <arg> tags.
  (EXAMPLE): Added empty example.

* mandos.xml (NETWORK PROTOCOL): Bug fix: Changed "1\r\en" back to
                                 "1\r\n".
  (CHECKING): Do not refer to the non-relevant mandos.conf(5) manual.

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) KEYCOMMENT="$2"; shift 2;;
 
73
        -x|--expire) KEYEXPIRE="$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 --secret-keyring "$SECRING" \
 
191
    --no-default-keyring --no-options --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 --secret-keyring "$SECRING" \
 
196
    --no-default-keyring --no-options --secret-keyring "$SECRING" \
197
197
    --keyring "$PUBRING" --export-options export-minimal \
198
198
    --comment "$FILECOMMENT" --output "$PUBKEYFILE" \
199
199
    --export