/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 Makefile

  • Committer: Teddy Hogeborn
  • Date: 2008-09-02 06:03:08 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080902060308-8uhgsfjiwixuvz6j
* plugin-runner.c (main/parse_opt): Removed code for "--config-file".
  (main/parse_opt_config_file): New function only for "--config-file".
  (main): Parse options first using "parse_opt_config_file", then from
          the config file, and lastly from the command line.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
92
92
check:
93
93
        ./mandos --check
94
94
 
95
 
# Run the client with a local config and key
 
95
# Run the server with a local key
96
96
run-client: all keydir/seckey.txt keydir/pubkey.txt \
97
97
        keydir/secring.gpg keydir/pubring.gpg
98
98
        ./plugin-runner --plugin-dir=plugins.d \
99
 
                --config-file=plugin-runner.conf \
100
99
                --options-for=password-request:--keydir=keydir
101
100
 
102
101
# Used by run-client