/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-07-20 00:59:17 UTC
  • Revision ID: teddy@recompile.se-20150720005917-ud7fxa6wcv9y4ta6
mandos-client: Bug fix: don't crash if --dh-params was not used.

* plugins.d/mandos-client.c (main): Bug fix: Check if dh_params_file
                                    is NULL before using it in the
                                    workaround for Debian bug #633582.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
 
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
 
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
1
WARN=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
 
2
        -Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
 
3
        -Wunused -Wuninitialized -Wstrict-overflow=5 \
 
4
        -Wsuggest-attribute=pure -Wsuggest-attribute=const \
 
5
        -Wsuggest-attribute=noreturn -Wfloat-equal -Wundef -Wshadow \
4
6
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
7
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
 
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
 
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code
 
8
        -Wconversion -Wlogical-op -Waggregate-return \
 
9
        -Wstrict-prototypes -Wold-style-definition \
 
10
        -Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
 
11
        -Wredundant-decls -Wnested-externs -Winline -Wvla \
 
12
        -Wvolatile-register-var -Woverlength-strings
9
13
#DEBUG=-ggdb3
10
 
# For info about _FORTIFY_SOURCE, see
11
 
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
 
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
12
15
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
13
16
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
14
17
LINK_FORTIFY_LD=-z relro -z now
20
23
LINK_FORTIFY += -pie
21
24
endif
22
25
#COVERAGE=--coverage
23
 
OPTIMIZE=-Os
24
 
LANGUAGE=-std=gnu99
 
26
OPTIMIZE=-Os -fno-strict-aliasing
 
27
LANGUAGE=-std=gnu11
25
28
htmldir=man
26
 
version=1.5.5
 
29
version=1.6.9
27
30
SED=sed
28
31
 
29
32
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
36
39
# MANDIR=$(PREFIX)/man
37
40
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
41
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
42
# LIBDIR=$(PREFIX)/lib
39
43
##
40
44
 
41
45
## These settings are for a package-type install
45
49
MANDIR=$(PREFIX)/share/man
46
50
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
51
STATEDIR=$(DESTDIR)/var/lib/mandos
 
52
LIBDIR=$(shell \
 
53
        for d in \
 
54
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
55
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
 
56
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
 
57
                        echo "$(DESTDIR)$$d"; \
 
58
                        break; \
 
59
                fi; \
 
60
        done)
48
61
##
49
62
 
 
63
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
64
 
50
65
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
51
66
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
52
67
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
54
69
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
55
70
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
56
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)
57
74
 
58
75
# Do not change these two
59
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
76
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
60
77
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
61
78
        -DVERSION='"$(version)"'
62
 
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
79
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
63
80
 
64
81
# Commands to format a DocBook <refentry> document into a manual page
65
82
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
70
87
        --param man.authors.section.enabled     0 \
71
88
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
89
        $(notdir $<); \
73
 
        $(MANPOST) $(notdir $@);\
74
90
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
75
91
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
76
92
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
77
93
        fi >/dev/null)
78
 
# DocBook-to-man post-processing to fix a '\n' escape bug
79
 
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
80
94
 
81
95
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
82
96
        --param make.year.ranges                1 \
94
108
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
95
109
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
96
110
        plugins.d/plymouth
97
 
CPROGS=plugin-runner $(PLUGINS)
 
111
PLUGIN_HELPERS=plugin-helpers/mandos-client-iprouteadddel
 
112
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
98
113
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
99
114
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
100
115
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
227
242
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
228
243
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
229
244
 
230
 
.PHONY : all doc html clean distclean run-client run-server install \
231
 
        install-server install-client uninstall uninstall-server \
232
 
        uninstall-client purge purge-server purge-client
 
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
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
 
250
        check run-client run-server install install-html \
 
251
        install-server install-client-nokey install-client uninstall \
 
252
        uninstall-server uninstall-client purge purge-server \
 
253
        purge-client
233
254
 
234
255
clean:
235
256
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
241
262
 
242
263
check:  all
243
264
        ./mandos --check
 
265
        ./mandos-ctl --check
244
266
 
245
267
# Run the client with a local config and key
246
268
run-client: all keydir/seckey.txt keydir/pubkey.txt
249
271
        @echo "# ignored.  The messages are caused by not running as root, but   #"
250
272
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
251
273
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
252
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
 
274
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
 
275
        @echo "#                     setuid: Operation not permitted             #"
253
276
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
254
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
255
 
        @echo "#                     seteuid: Operation not permitted            #"
256
 
        @echo "#                     klogctl: Operation not permitted            #"
 
277
        @echo "# From mandos-client:                                             #"
 
278
        @echo "#             Failed to raise privileges: Operation not permitted #"
 
279
        @echo "#             Warning: network hook \"*\" exited with status *      #"
257
280
        @echo "###################################################################"
 
281
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
258
282
        ./plugin-runner --plugin-dir=plugins.d \
 
283
                --plugin-helper-dir=plugin-helpers \
259
284
                --config-file=plugin-runner.conf \
260
285
                --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= \
261
287
                $(CLIENTARGS)
262
288
 
263
289
# Used by run-client
278
304
        install --directory confdir
279
305
        install --mode=u=rw $< $@
280
306
# Add a client password
281
 
        ./mandos-keygen --dir keydir --password >> $@
 
307
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
282
308
statedir:
283
309
        install --directory statedir
284
310
 
291
317
 
292
318
install-server: doc
293
319
        install --directory $(CONFDIR)
294
 
        install --directory --mode=u=rwx --owner=$(USER) \
295
 
                --group=$(GROUP) $(STATEDIR)
 
320
        if install --directory --mode=u=rwx --owner=$(USER) \
 
321
                --group=$(GROUP) $(STATEDIR); then \
 
322
                :; \
 
323
        elif install --directory --mode=u=rwx $(STATEDIR); then \
 
324
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
 
325
        fi
296
326
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
297
327
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
298
328
                mandos-ctl
306
336
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
307
337
        install --mode=u=rwx,go=rx init.d-mandos \
308
338
                $(DESTDIR)/etc/init.d/mandos
 
339
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
340
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
341
        fi
309
342
        install --mode=u=rw,go=r default-mandos \
310
343
                $(DESTDIR)/etc/default/mandos
311
344
        if [ -z $(DESTDIR) ]; then \
325
358
                > $(MANDIR)/man8/intro.8mandos.gz
326
359
 
327
360
install-client-nokey: all doc
328
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
361
        install --directory $(LIBDIR)/mandos $(CONFDIR)
329
362
        install --directory --mode=u=rwx $(KEYDIR) \
330
 
                $(PREFIX)/lib/mandos/plugins.d
331
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
363
                $(LIBDIR)/mandos/plugins.d \
 
364
                $(LIBDIR)/mandos/plugin-helpers
 
365
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
332
366
                install --mode=u=rwx \
333
367
                        --directory "$(CONFDIR)/plugins.d"; \
 
368
                install --directory "$(CONFDIR)/plugin-helpers"; \
334
369
        fi
335
370
        install --mode=u=rwx,go=rx --directory \
336
371
                "$(CONFDIR)/network-hooks.d"
337
372
        install --mode=u=rwx,go=rx \
338
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
373
                --target-directory=$(LIBDIR)/mandos plugin-runner
339
374
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
340
375
                mandos-keygen
341
376
        install --mode=u=rwx,go=rx \
342
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
377
                --target-directory=$(LIBDIR)/mandos/plugins.d \
343
378
                plugins.d/password-prompt
344
379
        install --mode=u=rwxs,go=rx \
345
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
380
                --target-directory=$(LIBDIR)/mandos/plugins.d \
346
381
                plugins.d/mandos-client
347
382
        install --mode=u=rwxs,go=rx \
348
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
383
                --target-directory=$(LIBDIR)/mandos/plugins.d \
349
384
                plugins.d/usplash
350
385
        install --mode=u=rwxs,go=rx \
351
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
386
                --target-directory=$(LIBDIR)/mandos/plugins.d \
352
387
                plugins.d/splashy
353
388
        install --mode=u=rwxs,go=rx \
354
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
389
                --target-directory=$(LIBDIR)/mandos/plugins.d \
355
390
                plugins.d/askpass-fifo
356
391
        install --mode=u=rwxs,go=rx \
357
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
392
                --target-directory=$(LIBDIR)/mandos/plugins.d \
358
393
                plugins.d/plymouth
 
394
        install --mode=u=rwxs,go=rx \
 
395
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
 
396
                plugin-helpers/mandos-client-iprouteadddel
359
397
        install initramfs-tools-hook \
360
398
                $(INITRAMFSTOOLS)/hooks/mandos
361
399
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
406
444
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
407
445
                $(DESTDIR)/etc/crypttab
408
446
        -rm --force $(PREFIX)/sbin/mandos-keygen \
409
 
                $(PREFIX)/lib/mandos/plugin-runner \
410
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
411
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
412
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
413
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
414
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
415
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
 
447
                $(LIBDIR)/mandos/plugin-runner \
 
448
                $(LIBDIR)/mandos/plugins.d/password-prompt \
 
449
                $(LIBDIR)/mandos/plugins.d/mandos-client \
 
450
                $(LIBDIR)/mandos/plugins.d/usplash \
 
451
                $(LIBDIR)/mandos/plugins.d/splashy \
 
452
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
 
453
                $(LIBDIR)/mandos/plugins.d/plymouth \
416
454
                $(INITRAMFSTOOLS)/hooks/mandos \
417
455
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
418
456
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
424
462
                $(MANDIR)/man8/splashy.8mandos.gz \
425
463
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
426
464
                $(MANDIR)/man8/plymouth.8mandos.gz \
427
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
428
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
465
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
466
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
429
467
        update-initramfs -k all -u
430
468
 
431
469
purge: purge-server purge-client
435
473
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
436
474
                $(DESTDIR)/etc/default/mandos \
437
475
                $(DESTDIR)/etc/init.d/mandos \
 
476
                $(SYSTEMD)/mandos.service \
 
477
                $(DESTDIR)/run/mandos.pid \
438
478
                $(DESTDIR)/var/run/mandos.pid
439
479
        -rmdir $(CONFDIR)
440
480