/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-23 22:12:57 UTC
  • Revision ID: teddy@recompile.se-20140323221257-9lkufevfdn4kwoq6
Use openat() etc. in plugin-runner.  Also one less useless warning.

* plugin-runner.c (main): Only print warning about failure to work
                          around Debian bug #633582 if the plugin
                          directory actually exists.  Use openat(),
                          fstat(), faccessat(), and eliminate
                          asprintf().

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)))
69
69
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
70
70
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
71
71
        getconf LFS_LDFLAGS)
72
 
LIBNL3_CFLAGS=$(shell pkg-config --cflags-only-I libnl-route-3.0)
73
 
LIBNL3_LIBS=$(shell pkg-config --libs libnl-route-3.0)
74
72
 
75
73
# Do not change these two
76
74
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
87
85
        --param man.authors.section.enabled     0 \
88
86
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
89
87
        $(notdir $<); \
 
88
        $(MANPOST) $(notdir $@);\
90
89
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
91
90
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
92
91
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
93
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'
94
95
 
95
96
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
96
97
        --param make.year.ranges                1 \
108
109
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
109
110
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
110
111
        plugins.d/plymouth
111
 
PLUGIN_HELPERS=plugin-helpers/mandos-client-iprouteadddel
112
 
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
112
CPROGS=plugin-runner $(PLUGINS)
113
113
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
114
114
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
115
115
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
242
242
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
243
243
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
244
244
 
245
 
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
246
 
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
247
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
248
 
 
249
245
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
250
246
        check run-client run-server install install-html \
251
247
        install-server install-client-nokey install-client uninstall \
271
267
        @echo "# ignored.  The messages are caused by not running as root, but   #"
272
268
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
273
269
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
274
 
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
275
 
        @echo "#                     setuid: Operation not permitted             #"
 
270
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
276
271
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
277
 
        @echo "# From mandos-client:                                             #"
278
 
        @echo "#             Failed to raise privileges: Operation not permitted #"
279
 
        @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            #"
280
275
        @echo "###################################################################"
281
 
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
282
276
        ./plugin-runner --plugin-dir=plugins.d \
283
 
                --plugin-helper-dir=plugin-helpers \
284
277
                --config-file=plugin-runner.conf \
285
278
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
286
 
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
287
279
                $(CLIENTARGS)
288
280
 
289
281
# Used by run-client
304
296
        install --directory confdir
305
297
        install --mode=u=rw $< $@
306
298
# Add a client password
307
 
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
 
299
        ./mandos-keygen --dir keydir --password >> $@
308
300
statedir:
309
301
        install --directory statedir
310
302
 
360
352
install-client-nokey: all doc
361
353
        install --directory $(LIBDIR)/mandos $(CONFDIR)
362
354
        install --directory --mode=u=rwx $(KEYDIR) \
363
 
                $(LIBDIR)/mandos/plugins.d \
364
 
                $(LIBDIR)/mandos/plugin-helpers
 
355
                $(LIBDIR)/mandos/plugins.d
365
356
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
366
357
                install --mode=u=rwx \
367
358
                        --directory "$(CONFDIR)/plugins.d"; \
368
 
                install --directory "$(CONFDIR)/plugin-helpers"; \
369
359
        fi
370
360
        install --mode=u=rwx,go=rx --directory \
371
361
                "$(CONFDIR)/network-hooks.d"
391
381
        install --mode=u=rwxs,go=rx \
392
382
                --target-directory=$(LIBDIR)/mandos/plugins.d \
393
383
                plugins.d/plymouth
394
 
        install --mode=u=rwxs,go=rx \
395
 
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
396
 
                plugin-helpers/mandos-client-iprouteadddel
397
384
        install initramfs-tools-hook \
398
385
                $(INITRAMFSTOOLS)/hooks/mandos
399
386
        install --mode=u=rw,go=r initramfs-tools-hook-conf \