/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: 2017-02-22 21:45:35 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 358.
  • Revision ID: teddy@recompile.se-20170222214535-milf6w0b1krwpaex
Server bug fix: Use the mandos.conf "zeroconf" and "restore" options

Allow the "zeroconf" and "restore" options to actually work from the
mandos.conf file, in addition to command line options.

Closes: 855589
Reported-by: Pablo Abelenda <pabelenda@igalia.com>
Suggested-by: Pablo Abelenda <pabelenda@igalia.com>

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
WARN:=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
 
1
WARN=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
2
2
        -Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
3
3
        -Wunused -Wuninitialized -Wstrict-overflow=5 \
4
4
        -Wsuggest-attribute=pure -Wsuggest-attribute=const \
10
10
        -Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
11
11
        -Wredundant-decls -Wnested-externs -Winline -Wvla \
12
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)))
 
13
#DEBUG=-ggdb3 -fsanitize=address 
 
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
 
15
# and <https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
16
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
19
17
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
20
18
ALL_SANITIZE_OPTIONS:=-fsanitize=leak -fsanitize=undefined \
21
19
        -fsanitize=shift -fsanitize=integer-divide-by-zero \
25
23
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
26
24
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
27
25
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
28
 
        -fsanitize=enum -fsanitize-address-use-after-scope
29
 
 
30
 
# 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:=-fstack-protector-all -fPIC
33
 
CPPFLAGS+=-D_FORTIFY_SOURCE=3
34
 
LINK_FORTIFY_LD:=-z relro -z now
35
 
LINK_FORTIFY:=
 
26
        -fsanitize=enum
 
27
# Check which sanitizing options can be used
 
28
SANITIZE:=$(foreach option,$(ALL_SANITIZE_OPTIONS),$(shell \
 
29
        echo 'int main(){}' | $(CC) --language=c $(option) /dev/stdin \
 
30
        -o /dev/null >/dev/null 2>&1 && echo $(option)))
 
31
LINK_FORTIFY_LD=-z relro -z now
 
32
LINK_FORTIFY=
36
33
 
37
34
# If BROKEN_PIE is set, do not build with -pie
38
35
ifndef BROKEN_PIE
40
37
LINK_FORTIFY += -pie
41
38
endif
42
39
#COVERAGE=--coverage
43
 
OPTIMIZE:=-Os -fno-strict-aliasing
44
 
LANGUAGE:=-std=gnu11
45
 
CPPFLAGS+=-D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
46
 
htmldir:=man
47
 
version:=1.8.17
48
 
SED:=sed
49
 
PKG_CONFIG?=pkg-config
50
 
 
51
 
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
52
 
        || getent passwd nobody || echo 65534)))
53
 
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
54
 
        || getent group nogroup || echo 65534)))
55
 
 
56
 
LINUXVERSION:=$(shell uname --kernel-release)
 
40
OPTIMIZE=-Os -fno-strict-aliasing
 
41
LANGUAGE=-std=gnu11
 
42
htmldir=man
 
43
version=1.7.14
 
44
SED=sed
 
45
 
 
46
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
 
47
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nogroup || echo 65534)))
57
48
 
58
49
## Use these settings for a traditional /usr/local install
59
 
# PREFIX:=$(DESTDIR)/usr/local
60
 
# BINDIR:=$(PREFIX)/sbin
61
 
# CONFDIR:=$(DESTDIR)/etc/mandos
62
 
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
63
 
# MANDIR:=$(PREFIX)/man
64
 
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
65
 
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
66
 
# STATEDIR:=$(DESTDIR)/var/lib/mandos
67
 
# LIBDIR:=$(PREFIX)/lib
68
 
# DBUSPOLICYDIR:=$(DESTDIR)/etc/dbus-1/system.d
 
50
# PREFIX=$(DESTDIR)/usr/local
 
51
# CONFDIR=$(DESTDIR)/etc/mandos
 
52
# KEYDIR=$(DESTDIR)/etc/mandos/keys
 
53
# MANDIR=$(PREFIX)/man
 
54
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
55
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
56
# LIBDIR=$(PREFIX)/lib
69
57
##
70
58
 
71
59
## These settings are for a package-type install
72
 
PREFIX:=$(DESTDIR)/usr
73
 
BINDIR:=$(PREFIX)/sbin
74
 
CONFDIR:=$(DESTDIR)/etc/mandos
75
 
KEYDIR:=$(DESTDIR)/etc/keys/mandos
76
 
MANDIR:=$(PREFIX)/share/man
77
 
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
78
 
DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
79
 
STATEDIR:=$(DESTDIR)/var/lib/mandos
80
 
LIBDIR:=$(shell \
 
60
PREFIX=$(DESTDIR)/usr
 
61
CONFDIR=$(DESTDIR)/etc/mandos
 
62
KEYDIR=$(DESTDIR)/etc/keys/mandos
 
63
MANDIR=$(PREFIX)/share/man
 
64
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
65
STATEDIR=$(DESTDIR)/var/lib/mandos
 
66
LIBDIR=$(shell \
81
67
        for d in \
82
 
        "/usr/lib/`dpkg-architecture \
83
 
                        -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
68
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
84
69
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
85
70
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
86
71
                        echo "$(DESTDIR)$$d"; \
87
72
                        break; \
88
73
                fi; \
89
74
        done)
90
 
DBUSPOLICYDIR:=$(DESTDIR)/usr/share/dbus-1/system.d
91
75
##
92
76
 
93
 
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
94
 
                        --variable=systemdsystemunitdir)
95
 
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
96
 
                        --variable=tmpfilesdir)
97
 
SYSUSERS:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
98
 
                        --variable=sysusersdir)
 
77
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
78
TMPFILES=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
99
79
 
100
 
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
101
 
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
102
 
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
103
 
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
104
 
GPGME_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gpgme 2>/dev/null \
105
 
        || gpgme-config --cflags; getconf LFS_CFLAGS)
106
 
GPGME_LIBS:=$(shell $(PKG_CONFIG) --libs gpgme 2>/dev/null \
107
 
        || gpgme-config --libs; getconf LFS_LIBS; \
 
80
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
81
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
82
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
 
83
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
 
84
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
85
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
108
86
        getconf LFS_LDFLAGS)
109
 
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
110
 
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
111
 
GLIB_CFLAGS:=$(shell $(PKG_CONFIG) --cflags glib-2.0)
112
 
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
 
87
LIBNL3_CFLAGS=$(shell pkg-config --cflags-only-I libnl-route-3.0)
 
88
LIBNL3_LIBS=$(shell pkg-config --libs libnl-route-3.0)
113
89
 
114
90
# Do not change these two
115
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
116
 
        $(LANGUAGE) -DVERSION='"$(version)"'
117
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
118
 
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
91
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(SANITIZE) $(COVERAGE) \
 
92
        $(OPTIMIZE) $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) \
 
93
        $(GPGME_CFLAGS) -DVERSION='"$(version)"'
 
94
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
119
95
 
120
96
# Commands to format a DocBook <refentry> document into a manual page
121
97
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
127
103
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
128
104
        $(notdir $<); \
129
105
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
130
 
        && command -v man >/dev/null; then LANG=en_US.UTF-8 \
131
 
        MANWIDTH=80 man --warnings --encoding=UTF-8 --local-file \
132
 
        $(notdir $@); fi >/dev/null)
 
106
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
 
107
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
 
108
        fi >/dev/null)
133
109
 
134
110
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
135
111
        --param make.year.ranges                1 \
141
117
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
142
118
        $<; $(HTMLPOST) $@)
143
119
# Fix citerefentry links
144
 
HTMLPOST:=$(SED) --in-place \
 
120
HTMLPOST=$(SED) --in-place \
145
121
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
146
122
 
147
 
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
 
123
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
148
124
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
149
125
        plugins.d/plymouth
150
 
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
151
 
CPROGS:=plugin-runner dracut-module/password-agent $(PLUGINS) \
152
 
        $(PLUGIN_HELPERS)
153
 
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
154
 
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
126
PLUGIN_HELPERS=plugin-helpers/mandos-client-iprouteadddel
 
127
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
128
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
129
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
155
130
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
156
 
        dracut-module/password-agent.8mandos \
157
131
        plugins.d/mandos-client.8mandos \
158
132
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
159
133
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
160
134
        plugins.d/plymouth.8mandos intro.8mandos
161
135
 
162
 
htmldocs:=$(addsuffix .xhtml,$(DOCS))
163
 
 
164
 
objects:=$(addsuffix .o,$(CPROGS))
165
 
 
166
 
.PHONY: all
 
136
htmldocs=$(addsuffix .xhtml,$(DOCS))
 
137
 
 
138
objects=$(addsuffix .o,$(CPROGS))
 
139
 
167
140
all: $(PROGS) mandos.lsm
168
141
 
169
 
.PHONY: doc
170
142
doc: $(DOCS)
171
143
 
172
 
.PHONY: html
173
144
html: $(htmldocs)
174
145
 
175
146
%.5: %.xml common.ent legalnotice.xml
234
205
                overview.xml legalnotice.xml
235
206
        $(DOCBOOKTOHTML)
236
207
 
237
 
dracut-module/password-agent.8mandos: \
238
 
                dracut-module/password-agent.xml common.ent \
239
 
                overview.xml legalnotice.xml
240
 
        $(DOCBOOKTOMAN)
241
 
dracut-module/password-agent.8mandos.xhtml: \
242
 
                dracut-module/password-agent.xml common.ent \
243
 
                overview.xml legalnotice.xml
244
 
        $(DOCBOOKTOHTML)
245
 
 
246
208
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
247
209
                                        common.ent \
248
210
                                        mandos-options.xml \
291
253
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
292
254
                $@)
293
255
 
294
 
# Does the linker support the --no-warn-execstack option?
295
 
ifeq ($(shell echo 'int main(){}'|$(CC) --language=c /dev/stdin -o /dev/null -Xlinker --no-warn-execstack >/dev/null 2>&1 && echo yes),yes)
296
 
# These programs use nested functions, which uses an executable stack
297
 
plugin-runner: LDFLAGS += -Xlinker --no-warn-execstack
298
 
dracut-module/password-agent: LDFLAGS += -Xlinker --no-warn-execstack
299
 
plugins.d/password-prompt: LDFLAGS += -Xlinker --no-warn-execstack
300
 
plugins.d/mandos-client: LDFLAGS += -Xlinker --no-warn-execstack
301
 
plugins.d/plymouth: LDFLAGS += -Xlinker --no-warn-execstack
302
 
endif
303
 
 
304
 
# Need to add the GnuTLS, Avahi and GPGME libraries
305
 
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
306
 
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
307
 
plugins.d/mandos-client: LDLIBS += $(GNUTLS_LIBS) $(strip \
308
 
        ) $(AVAHI_LIBS) $(GPGME_LIBS)
309
 
 
310
 
# Need to add the libnl-route library
311
 
plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)
312
 
plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)
313
 
 
314
 
# Need to add the GLib and pthread libraries
315
 
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
316
 
# Note: -lpthread is unnecessary with the GNU C library 2.34 or later
317
 
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
318
 
 
319
 
.PHONY: clean
 
256
plugins.d/mandos-client: plugins.d/mandos-client.c
 
257
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
258
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
259
 
 
260
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
 
261
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
 
262
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
263
 
 
264
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
 
265
        check run-client run-server install install-html \
 
266
        install-server install-client-nokey install-client uninstall \
 
267
        uninstall-server uninstall-client purge purge-server \
 
268
        purge-client
 
269
 
320
270
clean:
321
271
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
322
272
 
323
 
.PHONY: distclean
324
273
distclean: clean
325
 
.PHONY: mostlyclean
326
274
mostlyclean: clean
327
 
.PHONY: maintainer-clean
328
275
maintainer-clean: clean
329
276
        -rm --force --recursive keydir confdir statedir
330
277
 
331
 
.PHONY: check
332
 
check: all
 
278
check:  all
333
279
        ./mandos --check
334
280
        ./mandos-ctl --check
335
 
        ./mandos-keygen --version
336
 
        ./plugin-runner --version
337
 
        ./plugin-helpers/mandos-client-iprouteadddel --version
338
 
        ./dracut-module/password-agent --test
339
281
 
340
282
# Run the client with a local config and key
341
 
.PHONY: run-client
342
 
run-client: all keydir/seckey.txt keydir/pubkey.txt \
343
 
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
344
 
        @echo '######################################################'
345
 
        @echo '# The following error messages are harmless and can  #'
346
 
        @echo '#  be safely ignored:                                #'
347
 
        @echo '## From plugin-runner:                               #'
348
 
        @echo '# setgid: Operation not permitted                    #'
349
 
        @echo '# setuid: Operation not permitted                    #'
350
 
        @echo '## From askpass-fifo:                                #'
351
 
        @echo '# mkfifo: Permission denied                          #'
352
 
        @echo '## From mandos-client:                               #'
353
 
        @echo '# Failed to raise privileges: Operation not permi... #'
354
 
        @echo '# Warning: network hook "*" exited with status *     #'
355
 
        @echo '# ioctl SIOCSIFFLAGS +IFF_UP: Operation not permi... #'
356
 
        @echo '# Failed to bring up interface "*": Operation not... #'
357
 
        @echo '#                                                    #'
358
 
        @echo '# (The messages are caused by not running as root,   #'
359
 
        @echo '# but you should NOT run "make run-client" as root   #'
360
 
        @echo '# unless you also unpacked and compiled Mandos as    #'
361
 
        @echo '# root, which is also NOT recommended.)              #'
362
 
        @echo '######################################################'
 
283
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
284
        @echo "###################################################################"
 
285
        @echo "# The following error messages are harmless and can be safely     #"
 
286
        @echo "# ignored:                                                        #"
 
287
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
 
288
        @echo "#                     setuid: Operation not permitted             #"
 
289
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
 
290
        @echo "# From mandos-client:                                             #"
 
291
        @echo "#             Failed to raise privileges: Operation not permitted #"
 
292
        @echo "#             Warning: network hook \"*\" exited with status *      #"
 
293
        @echo "#                                                                 #"
 
294
        @echo "# (The messages are caused by not running as root, but you should #"
 
295
        @echo "# NOT run \"make run-client\" as root unless you also unpacked and  #"
 
296
        @echo "# compiled Mandos as root, which is also NOT recommended.)        #"
 
297
        @echo "###################################################################"
363
298
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
364
299
        ./plugin-runner --plugin-dir=plugins.d \
365
300
                --plugin-helper-dir=plugin-helpers \
366
301
                --config-file=plugin-runner.conf \
367
 
                --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 \
 
302
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
368
303
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
369
304
                $(CLIENTARGS)
370
305
 
371
306
# Used by run-client
372
 
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
 
307
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
373
308
        install --directory keydir
374
309
        ./mandos-keygen --dir keydir --force
375
 
        if ! [ -e keydir/tls-privkey.pem ]; then \
376
 
                install --mode=u=rw /dev/null keydir/tls-privkey.pem; \
377
 
        fi
378
 
        if ! [ -e keydir/tls-pubkey.pem ]; then \
379
 
                install --mode=u=rw /dev/null keydir/tls-pubkey.pem; \
380
 
        fi
381
310
 
382
311
# Run the server with a local config
383
 
.PHONY: run-server
384
312
run-server: confdir/mandos.conf confdir/clients.conf statedir
385
313
        ./mandos --debug --no-dbus --configdir=confdir \
386
314
                --statedir=statedir $(SERVERARGS)
387
315
 
388
316
# Used by run-server
389
317
confdir/mandos.conf: mandos.conf
390
 
        install -D --mode=u=rw,go=r $^ $@
391
 
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
392
 
        install -D --mode=u=rw $< $@
 
318
        install --directory confdir
 
319
        install --mode=u=rw,go=r $^ $@
 
320
confdir/clients.conf: clients.conf keydir/seckey.txt
 
321
        install --directory confdir
 
322
        install --mode=u=rw $< $@
393
323
# Add a client password
394
324
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
395
325
statedir:
396
326
        install --directory statedir
397
327
 
398
 
.PHONY: install
399
328
install: install-server install-client-nokey
400
329
 
401
 
.PHONY: install-html
402
330
install-html: html
403
 
        install -D --mode=u=rw,go=r --target-directory=$(htmldir) \
 
331
        install --directory $(htmldir)
 
332
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
404
333
                $(htmldocs)
405
334
 
406
 
.PHONY: install-server
407
335
install-server: doc
 
336
        install --directory $(CONFDIR)
408
337
        if install --directory --mode=u=rwx --owner=$(USER) \
409
338
                --group=$(GROUP) $(STATEDIR); then \
410
339
                :; \
411
340
        elif install --directory --mode=u=rwx $(STATEDIR); then \
412
341
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
413
342
        fi
414
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" ]; then \
415
 
                install -D --mode=u=rw,go=r tmpfiles.d-mandos.conf \
 
343
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
 
344
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
416
345
                        $(TMPFILES)/mandos.conf; \
417
346
        fi
418
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
419
 
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
420
 
                        $(SYSUSERS)/mandos.conf; \
421
 
        fi
422
 
        install --directory $(BINDIR)
423
 
        install --mode=u=rwx,go=rx --target-directory=$(BINDIR) mandos
424
 
        install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \
 
347
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
348
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
425
349
                mandos-ctl
426
 
        install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \
 
350
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
427
351
                mandos-monitor
428
 
        install --directory $(CONFDIR)
429
352
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
430
353
                mandos.conf
431
354
        install --mode=u=rw --target-directory=$(CONFDIR) \
432
355
                clients.conf
433
 
        install -D --mode=u=rw,go=r dbus-mandos.conf \
434
 
                $(DBUSPOLICYDIR)/mandos.conf
435
 
        install -D --mode=u=rwx,go=rx init.d-mandos \
 
356
        install --mode=u=rw,go=r dbus-mandos.conf \
 
357
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
 
358
        install --mode=u=rwx,go=rx init.d-mandos \
436
359
                $(DESTDIR)/etc/init.d/mandos
437
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" ]; then \
438
 
                install -D --mode=u=rw,go=r mandos.service \
439
 
                        $(SYSTEMD); \
 
360
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
361
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
440
362
        fi
441
 
        install -D --mode=u=rw,go=r default-mandos \
 
363
        install --mode=u=rw,go=r default-mandos \
442
364
                $(DESTDIR)/etc/default/mandos
443
365
        if [ -z $(DESTDIR) ]; then \
444
366
                update-rc.d mandos defaults 25 15;\
445
367
        fi
446
 
        install --directory $(MANDIR)/man8 $(MANDIR)/man5
447
368
        gzip --best --to-stdout mandos.8 \
448
369
                > $(MANDIR)/man8/mandos.8.gz
449
370
        gzip --best --to-stdout mandos-monitor.8 \
457
378
        gzip --best --to-stdout intro.8mandos \
458
379
                > $(MANDIR)/man8/intro.8mandos.gz
459
380
 
460
 
.PHONY: install-client-nokey
461
381
install-client-nokey: all doc
 
382
        install --directory $(LIBDIR)/mandos $(CONFDIR)
462
383
        install --directory --mode=u=rwx $(KEYDIR) \
463
384
                $(LIBDIR)/mandos/plugins.d \
464
385
                $(LIBDIR)/mandos/plugin-helpers
465
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
466
 
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
467
 
                        $(SYSUSERS)/mandos-client.conf; \
468
 
        fi
469
386
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
470
 
                install --directory \
471
 
                        --mode=u=rwx "$(CONFDIR)/plugins.d" \
 
387
                install --mode=u=rwx \
 
388
                        --directory "$(CONFDIR)/plugins.d" \
472
389
                        "$(CONFDIR)/plugin-helpers"; \
473
390
        fi
474
 
        install --directory --mode=u=rwx,go=rx \
 
391
        install --mode=u=rwx,go=rx --directory \
475
392
                "$(CONFDIR)/network-hooks.d"
476
393
        install --mode=u=rwx,go=rx \
477
394
                --target-directory=$(LIBDIR)/mandos plugin-runner
478
 
        install --mode=u=rwx,go=rx \
479
 
                --target-directory=$(LIBDIR)/mandos \
480
 
                mandos-to-cryptroot-unlock
481
 
        install --directory $(BINDIR)
482
 
        install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \
 
395
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
483
396
                mandos-keygen
484
397
        install --mode=u=rwx,go=rx \
485
398
                --target-directory=$(LIBDIR)/mandos/plugins.d \
502
415
        install --mode=u=rwx,go=rx \
503
416
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
504
417
                plugin-helpers/mandos-client-iprouteadddel
505
 
        install -D initramfs-tools-hook \
 
418
        install initramfs-tools-hook \
506
419
                $(INITRAMFSTOOLS)/hooks/mandos
507
 
        install -D --mode=u=rw,go=r initramfs-tools-conf \
508
 
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
509
 
        install -D --mode=u=rw,go=r initramfs-tools-conf-hook \
510
 
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
511
 
        install -D initramfs-tools-script \
 
420
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
421
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
 
422
        install initramfs-tools-script \
512
423
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
513
 
        install -D initramfs-tools-script-stop \
514
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
515
 
        install -D --mode=u=rw,go=r \
516
 
                --target-directory=$(DRACUTMODULE) \
517
 
                dracut-module/ask-password-mandos.path \
518
 
                dracut-module/ask-password-mandos.service
519
 
        install --mode=u=rwxs,go=rx \
520
 
                --target-directory=$(DRACUTMODULE) \
521
 
                dracut-module/module-setup.sh \
522
 
                dracut-module/cmdline-mandos.sh \
523
 
                dracut-module/password-agent
524
424
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
525
 
        install --directory $(MANDIR)/man8
526
425
        gzip --best --to-stdout mandos-keygen.8 \
527
426
                > $(MANDIR)/man8/mandos-keygen.8.gz
528
427
        gzip --best --to-stdout plugin-runner.8mandos \
539
438
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
540
439
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
541
440
                > $(MANDIR)/man8/plymouth.8mandos.gz
542
 
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
543
 
                > $(MANDIR)/man8/password-agent.8mandos.gz
544
441
 
545
 
.PHONY: install-client
546
442
install-client: install-client-nokey
547
443
# Post-installation stuff
548
 
        -$(BINDIR)/mandos-keygen --dir "$(KEYDIR)"
549
 
        if command -v update-initramfs >/dev/null; then \
550
 
            update-initramfs -k all -u; \
551
 
        elif command -v dracut >/dev/null; then \
552
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
553
 
                if [ -w "$$initrd" ]; then \
554
 
                    chmod go-r "$$initrd"; \
555
 
                    dracut --force "$$initrd"; \
556
 
                fi; \
557
 
            done; \
558
 
        fi
 
444
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
 
445
        update-initramfs -k all -u
559
446
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
560
447
 
561
 
.PHONY: uninstall
562
448
uninstall: uninstall-server uninstall-client
563
449
 
564
 
.PHONY: uninstall-server
565
450
uninstall-server:
566
 
        -rm --force $(BINDIR)/mandos \
567
 
                $(BINDIR)/mandos-ctl \
568
 
                $(BINDIR)/mandos-monitor \
 
451
        -rm --force $(PREFIX)/sbin/mandos \
 
452
                $(PREFIX)/sbin/mandos-ctl \
 
453
                $(PREFIX)/sbin/mandos-monitor \
569
454
                $(MANDIR)/man8/mandos.8.gz \
570
455
                $(MANDIR)/man8/mandos-monitor.8.gz \
571
456
                $(MANDIR)/man8/mandos-ctl.8.gz \
574
459
        update-rc.d -f mandos remove
575
460
        -rmdir $(CONFDIR)
576
461
 
577
 
.PHONY: uninstall-client
578
462
uninstall-client:
579
463
# Refuse to uninstall client if /etc/crypttab is explicitly configured
580
464
# to use it.
581
465
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
582
466
                $(DESTDIR)/etc/crypttab
583
 
        -rm --force $(BINDIR)/mandos-keygen \
 
467
        -rm --force $(PREFIX)/sbin/mandos-keygen \
584
468
                $(LIBDIR)/mandos/plugin-runner \
585
469
                $(LIBDIR)/mandos/plugins.d/password-prompt \
586
470
                $(LIBDIR)/mandos/plugins.d/mandos-client \
591
475
                $(INITRAMFSTOOLS)/hooks/mandos \
592
476
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
593
477
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
594
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos \
595
 
                $(DRACUTMODULE)/ask-password-mandos.path \
596
 
                $(DRACUTMODULE)/ask-password-mandos.service \
597
 
                $(DRACUTMODULE)/module-setup.sh \
598
 
                $(DRACUTMODULE)/cmdline-mandos.sh \
599
 
                $(DRACUTMODULE)/password-agent \
600
478
                $(MANDIR)/man8/mandos-keygen.8.gz \
601
479
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
602
480
                $(MANDIR)/man8/mandos-client.8mandos.gz
605
483
                $(MANDIR)/man8/splashy.8mandos.gz \
606
484
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
607
485
                $(MANDIR)/man8/plymouth.8mandos.gz \
608
 
                $(MANDIR)/man8/password-agent.8mandos.gz \
609
486
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
610
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR) $(DRACUTMODULE)
611
 
        if command -v update-initramfs >/dev/null; then \
612
 
            update-initramfs -k all -u; \
613
 
        elif command -v dracut >/dev/null; then \
614
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
615
 
                test -w "$$initrd" && dracut --force "$$initrd"; \
616
 
            done; \
617
 
        fi
 
487
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
488
        update-initramfs -k all -u
618
489
 
619
 
.PHONY: purge
620
490
purge: purge-server purge-client
621
491
 
622
 
.PHONY: purge-server
623
492
purge-server: uninstall-server
624
493
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
625
494
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
626
495
                $(DESTDIR)/etc/default/mandos \
627
496
                $(DESTDIR)/etc/init.d/mandos \
 
497
                $(SYSTEMD)/mandos.service \
628
498
                $(DESTDIR)/run/mandos.pid \
629
499
                $(DESTDIR)/var/run/mandos.pid
630
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
631
 
                -rm --force -- $(SYSTEMD)/mandos.service; \
632
 
        fi
633
500
        -rmdir $(CONFDIR)
634
501
 
635
 
.PHONY: purge-client
636
502
purge-client: uninstall-client
637
 
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
 
503
        -shred --remove $(KEYDIR)/seckey.txt
638
504
        -rm --force $(CONFDIR)/plugin-runner.conf \
639
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
640
 
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
 
505
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
641
506
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)