/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-06 02:26:04 UTC
  • Revision ID: teddy@recompile.se-20140306022604-4uc43taz25cflgi3
Bug fix: Free all memory and give better messages when memory is full.

* plugin-runner.c (add_to_char_array): Bug fix: If realloc fails, do
                                       not change old array pointer.
  (add_environment): Bug fix: If realloc fails, do not change old
                     environment pointer.  Also rename "e" to "envdef"
                     for clarity.
  (main): Bug fix: If realloc fails, do not change old pointers.  Also
          wrap "#pragma GCC" with "#ifdef ___GNUC___".
* plugins.d/mandos-client.c (incbuffer): Bug fix: if realloc fails,
                                         free old buffer.
  (run_network_hooks): Moved variables "directory" and "ret" to their
                       innermost possible scope.
  (take_down_interface): Moved variables "sd", "ret_errno", and
                         "ret_setflags" to their innermost possible
                         scope.
  (main): Removed variable "interfaces_hooks_size".  Also, if argz_add
          fails when adding all found interfaces, the error message
          will now be correct.  Also print error message if, after
          having taken up an interface, argz_add fails to add
          interface to list of interfaces to be taken down.
* plugins.d/mandos-client.xml (OPTIONS): Explain better what "none"
                                         means as argument to
                                         "--interface" by negating
                                         sense.
* plugins.d/password-prompt.c (fprintf_plus): Removed (unused).

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
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 \
 
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 \
6
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
7
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
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
13
 
 
14
 
#DEBUG:=-ggdb3 -fsanitize=address $(SANITIZE)
15
 
## Check which sanitizing options can be used
16
 
#SANITIZE:=$(foreach option,$(ALL_SANITIZE_OPTIONS),$(shell \
17
 
#       echo 'int main(){}' | $(CC) --language=c $(option) \
18
 
#       /dev/stdin -o /dev/null >/dev/null 2>&1 && echo $(option)))
19
 
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
20
 
ALL_SANITIZE_OPTIONS:=-fsanitize=leak -fsanitize=undefined \
21
 
        -fsanitize=shift -fsanitize=integer-divide-by-zero \
22
 
        -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null \
23
 
        -fsanitize=return -fsanitize=signed-integer-overflow \
24
 
        -fsanitize=bounds -fsanitize=alignment \
25
 
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
26
 
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
27
 
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
28
 
        -fsanitize=enum -fsanitize-address-use-after-scope
29
 
 
 
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
 
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var \
 
8
        -Wunreachable-code
 
9
#DEBUG=-ggdb3
30
10
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
31
 
# and <https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
32
 
FORTIFY:=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
33
 
LINK_FORTIFY_LD:=-z relro -z now
34
 
LINK_FORTIFY:=
 
11
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
 
13
LINK_FORTIFY_LD=-z relro -z now
 
14
LINK_FORTIFY=
35
15
 
36
16
# If BROKEN_PIE is set, do not build with -pie
37
17
ifndef BROKEN_PIE
39
19
LINK_FORTIFY += -pie
40
20
endif
41
21
#COVERAGE=--coverage
42
 
OPTIMIZE:=-Os -fno-strict-aliasing
43
 
LANGUAGE:=-std=gnu11
44
 
htmldir:=man
45
 
version:=1.8.5
46
 
SED:=sed
47
 
PKG_CONFIG?=pkg-config
48
 
 
49
 
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
50
 
        || getent passwd nobody || echo 65534)))
51
 
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
52
 
        || getent group nogroup || echo 65534)))
53
 
 
54
 
LINUXVERSION:=$(shell uname --kernel-release)
 
22
OPTIMIZE=-Os
 
23
LANGUAGE=-std=gnu99
 
24
htmldir=man
 
25
version=1.6.4
 
26
SED=sed
 
27
 
 
28
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
 
29
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
55
30
 
56
31
## Use these settings for a traditional /usr/local install
57
 
# PREFIX:=$(DESTDIR)/usr/local
58
 
# CONFDIR:=$(DESTDIR)/etc/mandos
59
 
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
60
 
# MANDIR:=$(PREFIX)/man
61
 
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
62
 
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
63
 
# STATEDIR:=$(DESTDIR)/var/lib/mandos
64
 
# LIBDIR:=$(PREFIX)/lib
 
32
# PREFIX=$(DESTDIR)/usr/local
 
33
# CONFDIR=$(DESTDIR)/etc/mandos
 
34
# KEYDIR=$(DESTDIR)/etc/mandos/keys
 
35
# MANDIR=$(PREFIX)/man
 
36
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
37
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
38
# LIBDIR=$(PREFIX)/lib
65
39
##
66
40
 
67
41
## These settings are for a package-type install
68
 
PREFIX:=$(DESTDIR)/usr
69
 
CONFDIR:=$(DESTDIR)/etc/mandos
70
 
KEYDIR:=$(DESTDIR)/etc/keys/mandos
71
 
MANDIR:=$(PREFIX)/share/man
72
 
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
73
 
DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
74
 
STATEDIR:=$(DESTDIR)/var/lib/mandos
75
 
LIBDIR:=$(shell \
 
42
PREFIX=$(DESTDIR)/usr
 
43
CONFDIR=$(DESTDIR)/etc/mandos
 
44
KEYDIR=$(DESTDIR)/etc/keys/mandos
 
45
MANDIR=$(PREFIX)/share/man
 
46
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
47
STATEDIR=$(DESTDIR)/var/lib/mandos
 
48
LIBDIR=$(shell \
76
49
        for d in \
77
 
        "/usr/lib/`dpkg-architecture \
78
 
                        -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
50
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
79
51
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
80
52
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
81
53
                        echo "$(DESTDIR)$$d"; \
84
56
        done)
85
57
##
86
58
 
87
 
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
88
 
                        --variable=systemdsystemunitdir)
89
 
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
90
 
                        --variable=tmpfilesdir)
 
59
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
91
60
 
92
 
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
93
 
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
94
 
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
95
 
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
96
 
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
97
 
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
61
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
62
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
63
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
 
64
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
 
65
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
66
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
98
67
        getconf LFS_LDFLAGS)
99
 
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
100
 
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
101
 
GLIB_CFLAGS:=$(shell $(PKG_CONFIG) --cflags glib-2.0)
102
 
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
103
68
 
104
69
# Do not change these two
105
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
106
 
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
107
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
108
 
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
70
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
71
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
 
72
        -DVERSION='"$(version)"'
 
73
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
109
74
 
110
75
# Commands to format a DocBook <refentry> document into a manual page
111
76
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
116
81
        --param man.authors.section.enabled     0 \
117
82
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
118
83
        $(notdir $<); \
 
84
        $(MANPOST) $(notdir $@);\
119
85
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
120
 
        && command -v man >/dev/null; then LANG=en_US.UTF-8 \
121
 
        MANWIDTH=80 man --warnings --encoding=UTF-8 --local-file \
122
 
        $(notdir $@); fi >/dev/null)
 
86
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
 
87
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
 
88
        fi >/dev/null)
 
89
# DocBook-to-man post-processing to fix a '\n' escape bug
 
90
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
123
91
 
124
92
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
125
93
        --param make.year.ranges                1 \
131
99
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
132
100
        $<; $(HTMLPOST) $@)
133
101
# Fix citerefentry links
134
 
HTMLPOST:=$(SED) --in-place \
 
102
HTMLPOST=$(SED) --in-place \
135
103
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
136
104
 
137
 
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
 
105
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
138
106
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
139
107
        plugins.d/plymouth
140
 
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
141
 
CPROGS:=plugin-runner dracut-module/password-agent $(PLUGINS) \
142
 
        $(PLUGIN_HELPERS)
143
 
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
144
 
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
108
CPROGS=plugin-runner $(PLUGINS)
 
109
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
110
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
145
111
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
146
 
        dracut-module/password-agent.8mandos \
147
112
        plugins.d/mandos-client.8mandos \
148
113
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
149
114
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
150
115
        plugins.d/plymouth.8mandos intro.8mandos
151
116
 
152
 
htmldocs:=$(addsuffix .xhtml,$(DOCS))
 
117
htmldocs=$(addsuffix .xhtml,$(DOCS))
153
118
 
154
 
objects:=$(addsuffix .o,$(CPROGS))
 
119
objects=$(addsuffix .o,$(CPROGS))
155
120
 
156
121
all: $(PROGS) mandos.lsm
157
122
 
221
186
                overview.xml legalnotice.xml
222
187
        $(DOCBOOKTOHTML)
223
188
 
224
 
dracut-module/password-agent.8mandos: \
225
 
                dracut-module/password-agent.xml common.ent \
226
 
                overview.xml legalnotice.xml
227
 
        $(DOCBOOKTOMAN)
228
 
dracut-module/password-agent.8mandos.xhtml: \
229
 
                dracut-module/password-agent.xml common.ent \
230
 
                overview.xml legalnotice.xml
231
 
        $(DOCBOOKTOHTML)
232
 
 
233
189
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
234
190
                                        common.ent \
235
191
                                        mandos-options.xml \
278
234
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
279
235
                $@)
280
236
 
281
 
# Need to add the GnuTLS, Avahi and GPGME libraries
282
237
plugins.d/mandos-client: plugins.d/mandos-client.c
283
 
        $(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\
284
 
                ) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\
285
 
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
286
 
                ) $(LDLIBS) -o $@
287
 
 
288
 
# Need to add the libnl-route library
289
 
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
290
 
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
291
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
292
 
 
293
 
# Need to add the GLib and pthread libraries
294
 
dracut-module/password-agent: dracut-module/password-agent.c
295
 
        $(LINK.c) $(GLIB_CFLAGS) $^ $(GLIB_LIBS) -lpthread $(strip\
296
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
238
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
239
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
297
240
 
298
241
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
299
242
        check run-client run-server install install-html \
309
252
maintainer-clean: clean
310
253
        -rm --force --recursive keydir confdir statedir
311
254
 
312
 
check: all
 
255
check:  all
313
256
        ./mandos --check
314
257
        ./mandos-ctl --check
315
 
        ./mandos-keygen --version
316
 
        ./plugin-runner --version
317
 
        ./plugin-helpers/mandos-client-iprouteadddel --version
318
 
        ./dracut-module/password-agent --test
319
258
 
320
259
# Run the client with a local config and key
321
 
run-client: all keydir/seckey.txt keydir/pubkey.txt \
322
 
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
323
 
        @echo '######################################################'
324
 
        @echo '# The following error messages are harmless and can  #'
325
 
        @echo '#  be safely ignored:                                #'
326
 
        @echo '## From plugin-runner:                               #'
327
 
        @echo '# setgid: Operation not permitted                    #'
328
 
        @echo '# setuid: Operation not permitted                    #'
329
 
        @echo '## From askpass-fifo:                                #'
330
 
        @echo '# mkfifo: Permission denied                          #'
331
 
        @echo '## From mandos-client:                               #'
332
 
        @echo '# Failed to raise privileges: Operation not permi... #'
333
 
        @echo '# Warning: network hook "*" exited with status *     #'
334
 
        @echo '# ioctl SIOCSIFFLAGS +IFF_UP: Operation not permi... #'
335
 
        @echo '# Failed to bring up interface "*": Operation not... #'
336
 
        @echo '#                                                    #'
337
 
        @echo '# (The messages are caused by not running as root,   #'
338
 
        @echo '# but you should NOT run "make run-client" as root   #'
339
 
        @echo '# unless you also unpacked and compiled Mandos as    #'
340
 
        @echo '# root, which is also NOT recommended.)              #'
341
 
        @echo '######################################################'
342
 
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
 
260
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
261
        @echo "###################################################################"
 
262
        @echo "# The following error messages are harmless and can be safely     #"
 
263
        @echo "# ignored.  The messages are caused by not running as root, but   #"
 
264
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
 
265
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
 
266
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
 
267
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
 
268
        @echo "# From mandos-client: setuid: Operation not permitted             #"
 
269
        @echo "#                     seteuid: Operation not permitted            #"
 
270
        @echo "#                     klogctl: Operation not permitted            #"
 
271
        @echo "###################################################################"
343
272
        ./plugin-runner --plugin-dir=plugins.d \
344
 
                --plugin-helper-dir=plugin-helpers \
345
273
                --config-file=plugin-runner.conf \
346
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--tls-privkey=keydir/tls-privkey.pem,--tls-pubkey=keydir/tls-pubkey.pem,--network-hook-dir=network-hooks.d \
347
 
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
 
274
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
348
275
                $(CLIENTARGS)
349
276
 
350
277
# Used by run-client
351
 
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
 
278
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
352
279
        install --directory keydir
353
280
        ./mandos-keygen --dir keydir --force
354
281
 
361
288
confdir/mandos.conf: mandos.conf
362
289
        install --directory confdir
363
290
        install --mode=u=rw,go=r $^ $@
364
 
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
 
291
confdir/clients.conf: clients.conf keydir/seckey.txt
365
292
        install --directory confdir
366
293
        install --mode=u=rw $< $@
367
294
# Add a client password
368
 
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
 
295
        ./mandos-keygen --dir keydir --password >> $@
369
296
statedir:
370
297
        install --directory statedir
371
298
 
384
311
        elif install --directory --mode=u=rwx $(STATEDIR); then \
385
312
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
386
313
        fi
387
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
388
 
                        -a -d "$(TMPFILES)" ]; then \
389
 
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
390
 
                        $(TMPFILES)/mandos.conf; \
391
 
        fi
392
314
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
393
315
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
394
316
                mandos-ctl
426
348
install-client-nokey: all doc
427
349
        install --directory $(LIBDIR)/mandos $(CONFDIR)
428
350
        install --directory --mode=u=rwx $(KEYDIR) \
429
 
                $(LIBDIR)/mandos/plugins.d \
430
 
                $(LIBDIR)/mandos/plugin-helpers
 
351
                $(LIBDIR)/mandos/plugins.d
431
352
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
432
353
                install --mode=u=rwx \
433
 
                        --directory "$(CONFDIR)/plugins.d" \
434
 
                        "$(CONFDIR)/plugin-helpers"; \
 
354
                        --directory "$(CONFDIR)/plugins.d"; \
435
355
        fi
436
356
        install --mode=u=rwx,go=rx --directory \
437
357
                "$(CONFDIR)/network-hooks.d"
438
358
        install --mode=u=rwx,go=rx \
439
359
                --target-directory=$(LIBDIR)/mandos plugin-runner
440
 
        install --mode=u=rwx,go=rx \
441
 
                --target-directory=$(LIBDIR)/mandos \
442
 
                mandos-to-cryptroot-unlock
443
360
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
444
361
                mandos-keygen
445
362
        install --mode=u=rwx,go=rx \
460
377
        install --mode=u=rwxs,go=rx \
461
378
                --target-directory=$(LIBDIR)/mandos/plugins.d \
462
379
                plugins.d/plymouth
463
 
        install --mode=u=rwx,go=rx \
464
 
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
465
 
                plugin-helpers/mandos-client-iprouteadddel
466
380
        install initramfs-tools-hook \
467
381
                $(INITRAMFSTOOLS)/hooks/mandos
468
 
        install --mode=u=rw,go=r initramfs-tools-conf \
469
 
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
470
 
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
471
 
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
 
382
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
383
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
472
384
        install initramfs-tools-script \
473
385
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
474
 
        install initramfs-tools-script-stop \
475
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
476
 
        install --directory $(DRACUTMODULE)
477
 
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
478
 
                dracut-module/ask-password-mandos.path \
479
 
                dracut-module/ask-password-mandos.service
480
 
        install --mode=u=rwxs,go=rx \
481
 
                --target-directory=$(DRACUTMODULE) \
482
 
                dracut-module/module-setup.sh \
483
 
                dracut-module/cmdline-mandos.sh \
484
 
                dracut-module/password-agent
485
386
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
486
387
        gzip --best --to-stdout mandos-keygen.8 \
487
388
                > $(MANDIR)/man8/mandos-keygen.8.gz
499
400
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
500
401
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
501
402
                > $(MANDIR)/man8/plymouth.8mandos.gz
502
 
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
503
 
                > $(MANDIR)/man8/password-agent.8mandos.gz
504
403
 
505
404
install-client: install-client-nokey
506
405
# Post-installation stuff
507
406
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
508
 
        if command -v update-initramfs >/dev/null; then \
509
 
            update-initramfs -k all -u; \
510
 
        elif command -v dracut >/dev/null; then \
511
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
512
 
                if [ -w "$$initrd" ]; then \
513
 
                    chmod go-r "$$initrd"; \
514
 
                    dracut --force "$$initrd"; \
515
 
                fi; \
516
 
            done; \
517
 
        fi
 
407
        update-initramfs -k all -u
518
408
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
519
409
 
520
410
uninstall: uninstall-server uninstall-client
547
437
                $(INITRAMFSTOOLS)/hooks/mandos \
548
438
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
549
439
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
550
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos \
551
 
                $(DRACUTMODULE)/ask-password-mandos.path \
552
 
                $(DRACUTMODULE)/ask-password-mandos.service \
553
 
                $(DRACUTMODULE)/module-setup.sh \
554
 
                $(DRACUTMODULE)/cmdline-mandos.sh \
555
 
                $(DRACUTMODULE)/password-agent \
556
440
                $(MANDIR)/man8/mandos-keygen.8.gz \
557
441
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
558
442
                $(MANDIR)/man8/mandos-client.8mandos.gz
561
445
                $(MANDIR)/man8/splashy.8mandos.gz \
562
446
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
563
447
                $(MANDIR)/man8/plymouth.8mandos.gz \
564
 
                $(MANDIR)/man8/password-agent.8mandos.gz \
565
448
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
566
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR) $(DRACUTMODULE)
567
 
        if command -v update-initramfs >/dev/null; then \
568
 
            update-initramfs -k all -u; \
569
 
        elif command -v dracut >/dev/null; then \
570
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
571
 
                test -w "$$initrd" && dracut --force "$$initrd"; \
572
 
            done; \
573
 
        fi
 
449
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
450
        update-initramfs -k all -u
574
451
 
575
452
purge: purge-server purge-client
576
453
 
585
462
        -rmdir $(CONFDIR)
586
463
 
587
464
purge-client: uninstall-client
588
 
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
 
465
        -shred --remove $(KEYDIR)/seckey.txt
589
466
        -rm --force $(CONFDIR)/plugin-runner.conf \
590
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
591
 
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
 
467
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
592
468
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)