/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: 2014-03-27 21:24:33 UTC
  • Revision ID: teddy@recompile.se-20140327212433-oxdvfg1vsaagc6v0
Use fnmatch()in plugin-runner.

* plugin-runner.c (main): Use fnmatch().

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
26
26
OPTIMIZE=-Os -fno-strict-aliasing
27
27
LANGUAGE=-std=gnu99
28
28
htmldir=man
29
 
version=1.6.9
 
29
version=1.6.4
30
30
SED=sed
31
31
 
32
32
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
85
85
        --param man.authors.section.enabled     0 \
86
86
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
87
87
        $(notdir $<); \
 
88
        $(MANPOST) $(notdir $@);\
88
89
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
89
90
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
90
91
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
91
92
        fi >/dev/null)
 
93
# DocBook-to-man post-processing to fix a '\n' escape bug
 
94
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
92
95
 
93
96
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
94
97
        --param make.year.ranges                1 \
106
109
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
107
110
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
108
111
        plugins.d/plymouth
109
 
PLUGIN_HELPERS=
110
 
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
112
CPROGS=plugin-runner $(PLUGINS)
111
113
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
112
114
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
113
115
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
265
267
        @echo "# ignored.  The messages are caused by not running as root, but   #"
266
268
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
267
269
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
268
 
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
269
 
        @echo "#                     setuid: Operation not permitted             #"
 
270
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
270
271
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
271
 
        @echo "# From mandos-client:                                             #"
272
 
        @echo "#             Failed to raise privileges: Operation not permitted #"
273
 
        @echo "#             Warning: network hook \"*\" exited with status *      #"
 
272
        @echo "# From mandos-client: setuid: Operation not permitted             #"
 
273
        @echo "#                     seteuid: Operation not permitted            #"
 
274
        @echo "#                     klogctl: Operation not permitted            #"
274
275
        @echo "###################################################################"
275
 
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
276
276
        ./plugin-runner --plugin-dir=plugins.d \
277
 
                --plugin-helper-dir=plugin-helpers \
278
277
                --config-file=plugin-runner.conf \
279
278
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
280
 
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
281
279
                $(CLIENTARGS)
282
280
 
283
281
# Used by run-client
298
296
        install --directory confdir
299
297
        install --mode=u=rw $< $@
300
298
# Add a client password
301
 
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
 
299
        ./mandos-keygen --dir keydir --password >> $@
302
300
statedir:
303
301
        install --directory statedir
304
302
 
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"