/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: 2015-04-02 18:59:29 UTC
  • Revision ID: teddy@recompile.se-20150402185929-1q1rf1zelbpzzn74
Add "!RSA" also to examples/documentation.

* mandos.conf (priority): Add "!RSA" to default commented-out value.
* mandos.conf.xml (EXAMPLE): Add "!RSA" to example priority setting.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
106
106
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
107
107
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
108
108
        plugins.d/plymouth
109
 
PLUGIN_HELPERS=
110
 
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
109
CPROGS=plugin-runner $(PLUGINS)
111
110
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
112
111
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
113
112
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
274
273
        @echo "###################################################################"
275
274
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
276
275
        ./plugin-runner --plugin-dir=plugins.d \
277
 
                --plugin-helper-dir=plugin-helpers \
278
276
                --config-file=plugin-runner.conf \
279
277
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
280
278
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
358
356
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
359
357
                install --mode=u=rwx \
360
358
                        --directory "$(CONFDIR)/plugins.d"; \
361
 
                install --directory "$(CONFDIR)/plugin-helpers"; \
362
359
        fi
363
360
        install --mode=u=rwx,go=rx --directory \
364
361
                "$(CONFDIR)/network-hooks.d"