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

  • Committer: Teddy Hogeborn
  • Date: 2015-06-28 16:35:27 UTC
  • mto: (237.7.307 trunk)
  • mto: This revision was merged to the branch mainline in revision 325.
  • Revision ID: teddy@recompile.se-20150628163527-cky0ec59zew7teua
Add a plugin helper directory, available to all plugins.

* Makefile (PLUGIN_HELPERS): New; list of plugin helpers.
  (CPROGS): Appended "$(PLUGIN_HELPERS)".
* initramfs-tools-hook: Create new plugin helper directory, and copy
                        plugin helpers provided by the system and/or
                        by the local administrator.
  (PLUGINHELPERDIR): New.
* plugin-runner.c: Take new --plugin-helper-dir option and provide
                   environment variable to all plugins.
  (PHDIR): New; set to "/lib/mandos/plugin-helpers".
  (main/pluginhelperdir): New.
  (main/options): New option "--plugin-helper-dir".
  (main/parse_opt, main/parse_opt_config_file): Accept new option.
  (main): Use new option to set MANDOSPLUGINHELPERDIR environment
          variable as if using --global-env MANDOSPLUGINHELPERDIR=...
* plugin-runner.xml: Document new --plugin-helper-dir option.
  (SYNOPSIS, OPTIONS): Add "--plugin-helper-dir" option.
  (PLUGINS/WRITING PLUGINS): Document new environment variable
                             available to plugins.
  (ENVIRONMENT): Document new environment variable
                 "MANDOSPLUGINHELPERDIR" affected by the new
                 --plugin-helper-dir option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
26
26
OPTIMIZE=-Os -fno-strict-aliasing
27
27
LANGUAGE=-std=gnu99
28
28
htmldir=man
29
 
version=1.6.8
 
29
version=1.6.9
30
30
SED=sed
31
31
 
32
32
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
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
 
CPROGS=plugin-runner $(PLUGINS)
 
109
PLUGIN_HELPERS=
 
110
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
110
111
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
111
112
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
112
113
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
273
274
        @echo "###################################################################"
274
275
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
275
276
        ./plugin-runner --plugin-dir=plugins.d \
 
277
                --plugin-helper-dir=plugin-helpers \
276
278
                --config-file=plugin-runner.conf \
277
279
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
278
280
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
356
358
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
357
359
                install --mode=u=rwx \
358
360
                        --directory "$(CONFDIR)/plugins.d"; \
 
361
                install --directory "$(CONFDIR)/plugin-helpers"; \
359
362
        fi
360
363
        install --mode=u=rwx,go=rx --directory \
361
364
                "$(CONFDIR)/network-hooks.d"