/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

Code cleanup and one bug fix.

* mandos (Client.enable): Bug fix: Do not enable if already enabled.
  (MandosServer.__init__): Create empty set of clients if none passed.
  (main): Do not create clients set; do not pass a clients set to
          MandosServer.  Use tcp_server.clients throughout.

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
 
 
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:=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
33
 
LINK_FORTIFY_LD:=-z relro -z now
34
 
LINK_FORTIFY:=
35
 
 
36
 
# If BROKEN_PIE is set, do not build with -pie
37
 
ifndef BROKEN_PIE
38
 
FORTIFY += -fPIE
39
 
LINK_FORTIFY += -pie
40
 
endif
 
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
 
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
 
8
#       -Wunreachable-code 
 
9
#DEBUG=-ggdb3
 
10
# For info about _FORTIFY_SOURCE, see
 
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
 
13
LINK_FORTIFY_LD=-z relro -fPIE
 
14
LINK_FORTIFY=-pie
41
15
#COVERAGE=--coverage
42
 
OPTIMIZE:=-Os -fno-strict-aliasing
43
 
LANGUAGE:=-std=gnu11
44
 
FEATURES:=-D_FILE_OFFSET_BITS=64
45
 
htmldir:=man
46
 
version:=1.8.8
47
 
SED:=sed
48
 
PKG_CONFIG?=pkg-config
49
 
 
50
 
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
51
 
        || getent passwd nobody || echo 65534)))
52
 
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
53
 
        || getent group nogroup || echo 65534)))
54
 
 
55
 
LINUXVERSION:=$(shell uname --kernel-release)
 
16
OPTIMIZE=-Os
 
17
LANGUAGE=-std=gnu99
 
18
htmldir=man
 
19
version=1.0.8
 
20
SED=sed
56
21
 
57
22
## Use these settings for a traditional /usr/local install
58
 
# PREFIX:=$(DESTDIR)/usr/local
59
 
# CONFDIR:=$(DESTDIR)/etc/mandos
60
 
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
61
 
# MANDIR:=$(PREFIX)/man
62
 
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
63
 
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
64
 
# STATEDIR:=$(DESTDIR)/var/lib/mandos
65
 
# LIBDIR:=$(PREFIX)/lib
 
23
# PREFIX=$(DESTDIR)/usr/local
 
24
# CONFDIR=$(DESTDIR)/etc/mandos
 
25
# KEYDIR=$(DESTDIR)/etc/mandos/keys
 
26
# MANDIR=$(PREFIX)/man
 
27
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
66
28
##
67
29
 
68
30
## These settings are for a package-type install
69
 
PREFIX:=$(DESTDIR)/usr
70
 
CONFDIR:=$(DESTDIR)/etc/mandos
71
 
KEYDIR:=$(DESTDIR)/etc/keys/mandos
72
 
MANDIR:=$(PREFIX)/share/man
73
 
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
74
 
DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
75
 
STATEDIR:=$(DESTDIR)/var/lib/mandos
76
 
LIBDIR:=$(shell \
77
 
        for d in \
78
 
        "/usr/lib/`dpkg-architecture \
79
 
                        -qDEB_HOST_MULTIARCH 2>/dev/null`" \
80
 
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
81
 
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
82
 
                        echo "$(DESTDIR)$$d"; \
83
 
                        break; \
84
 
                fi; \
85
 
        done)
 
31
PREFIX=$(DESTDIR)/usr
 
32
CONFDIR=$(DESTDIR)/etc/mandos
 
33
KEYDIR=$(DESTDIR)/etc/keys/mandos
 
34
MANDIR=$(PREFIX)/share/man
 
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
86
36
##
87
37
 
88
 
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
89
 
                        --variable=systemdsystemunitdir)
90
 
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
91
 
                        --variable=tmpfilesdir)
92
 
SYSUSERS:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
93
 
                        --variable=sysusersdir)
94
 
 
95
 
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
96
 
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
97
 
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
98
 
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
99
 
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
100
 
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
38
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
39
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
 
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
 
42
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
43
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
101
44
        getconf LFS_LDFLAGS)
102
 
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
103
 
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
104
 
GLIB_CFLAGS:=$(shell $(PKG_CONFIG) --cflags glib-2.0)
105
 
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
106
45
 
107
46
# Do not change these two
108
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
109
 
        $(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
110
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
111
 
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
47
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
48
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
 
49
        -DVERSION='"$(version)"'
 
50
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
112
51
 
113
52
# Commands to format a DocBook <refentry> document into a manual page
114
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
53
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
115
54
        --param man.charmap.use.subset          0 \
116
55
        --param make.year.ranges                1 \
117
56
        --param make.single.year.ranges         1 \
118
57
        --param man.output.quietly              1 \
119
58
        --param man.authors.section.enabled     0 \
120
 
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
59
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
121
60
        $(notdir $<); \
122
 
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
123
 
        && command -v man >/dev/null; then LANG=en_US.UTF-8 \
124
 
        MANWIDTH=80 man --warnings --encoding=UTF-8 --local-file \
125
 
        $(notdir $@); fi >/dev/null)
 
61
        $(MANPOST) $(notdir $@)
 
62
# DocBook-to-man post-processing to fix a '\n' escape bug
 
63
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
126
64
 
127
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
65
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
128
66
        --param make.year.ranges                1 \
129
67
        --param make.single.year.ranges         1 \
130
68
        --param man.output.quietly              1 \
132
70
        --param citerefentry.link               1 \
133
71
        --output $@ \
134
72
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
135
 
        $<; $(HTMLPOST) $@)
 
73
        $<; $(HTMLPOST) $@
136
74
# Fix citerefentry links
137
 
HTMLPOST:=$(SED) --in-place \
 
75
HTMLPOST=$(SED) --in-place \
138
76
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
139
77
 
140
 
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
141
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
142
 
        plugins.d/plymouth
143
 
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
144
 
CPROGS:=plugin-runner dracut-module/password-agent $(PLUGINS) \
145
 
        $(PLUGIN_HELPERS)
146
 
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
147
 
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
148
 
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
149
 
        dracut-module/password-agent.8mandos \
 
78
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
 
79
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
 
80
CPROGS=plugin-runner $(PLUGINS)
 
81
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
82
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
150
83
        plugins.d/mandos-client.8mandos \
151
 
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
152
 
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
153
 
        plugins.d/plymouth.8mandos intro.8mandos
154
 
 
155
 
htmldocs:=$(addsuffix .xhtml,$(DOCS))
156
 
 
157
 
objects:=$(addsuffix .o,$(CPROGS))
 
84
        plugins.d/password-prompt.8mandos mandos.conf.5 \
 
85
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
86
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
87
 
 
88
htmldocs=$(addsuffix .xhtml,$(DOCS))
 
89
 
 
90
objects=$(addsuffix .o,$(CPROGS))
158
91
 
159
92
all: $(PROGS) mandos.lsm
160
93
 
177
110
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
178
111
        $(DOCBOOKTOHTML)
179
112
 
180
 
intro.8mandos: intro.xml common.ent legalnotice.xml
181
 
        $(DOCBOOKTOMAN)
182
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
183
 
        $(DOCBOOKTOHTML)
184
 
 
185
113
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
186
114
                legalnotice.xml
187
115
        $(DOCBOOKTOMAN)
196
124
                 legalnotice.xml
197
125
        $(DOCBOOKTOHTML)
198
126
 
199
 
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
200
 
                legalnotice.xml
201
 
        $(DOCBOOKTOMAN)
202
 
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
203
 
                 legalnotice.xml
204
 
        $(DOCBOOKTOHTML)
205
 
 
206
 
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
207
 
                legalnotice.xml
208
 
        $(DOCBOOKTOMAN)
209
 
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
210
 
                 legalnotice.xml
211
 
        $(DOCBOOKTOHTML)
212
 
 
213
127
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
214
128
                legalnotice.xml
215
129
        $(DOCBOOKTOMAN)
224
138
                overview.xml legalnotice.xml
225
139
        $(DOCBOOKTOHTML)
226
140
 
227
 
dracut-module/password-agent.8mandos: \
228
 
                dracut-module/password-agent.xml common.ent \
229
 
                overview.xml legalnotice.xml
230
 
        $(DOCBOOKTOMAN)
231
 
dracut-module/password-agent.8mandos.xhtml: \
232
 
                dracut-module/password-agent.xml common.ent \
233
 
                overview.xml legalnotice.xml
234
 
        $(DOCBOOKTOHTML)
235
 
 
236
141
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
237
142
                                        common.ent \
238
143
                                        mandos-options.xml \
246
151
 
247
152
# Update all these files with version number $(version)
248
153
common.ent: Makefile
249
 
        $(strip $(SED) --in-place \
 
154
        $(SED) --in-place \
250
155
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
251
 
                $@)
 
156
                $@
252
157
 
253
158
mandos: Makefile
254
 
        $(strip $(SED) --in-place \
 
159
        $(SED) --in-place \
255
160
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
256
 
                $@)
 
161
                $@
257
162
 
258
163
mandos-keygen: Makefile
259
 
        $(strip $(SED) --in-place \
 
164
        $(SED) --in-place \
260
165
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
261
 
                $@)
 
166
                $@
262
167
 
263
168
mandos-ctl: Makefile
264
 
        $(strip $(SED) --in-place \
265
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
266
 
                $@)
267
 
 
268
 
mandos-monitor: Makefile
269
 
        $(strip $(SED) --in-place \
270
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
271
 
                $@)
 
169
        $(SED) --in-place \
 
170
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
171
                $@
272
172
 
273
173
mandos.lsm: Makefile
274
 
        $(strip $(SED) --in-place \
 
174
        $(SED) --in-place \
275
175
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
276
 
                $@)
277
 
        $(strip $(SED) --in-place \
 
176
                $@
 
177
        $(SED) --in-place \
278
178
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
279
 
                $@)
280
 
        $(strip $(SED) --in-place \
 
179
                $@
 
180
        $(SED) --in-place \
281
181
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
282
 
                $@)
283
 
 
284
 
# Need to add the GnuTLS, Avahi and GPGME libraries
285
 
plugins.d/mandos-client: plugins.d/mandos-client.c
286
 
        $(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\
287
 
                ) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\
288
 
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
289
 
                ) $(LDLIBS) -o $@
290
 
 
291
 
# Need to add the libnl-route library
292
 
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
293
 
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
294
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
295
 
 
296
 
# Need to add the GLib and pthread libraries
297
 
dracut-module/password-agent: dracut-module/password-agent.c
298
 
        $(LINK.c) $(GLIB_CFLAGS) $^ $(GLIB_LIBS) -lpthread $(strip\
299
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
300
 
 
301
 
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
302
 
        check run-client run-server install install-html \
303
 
        install-server install-client-nokey install-client uninstall \
304
 
        uninstall-server uninstall-client purge purge-server \
305
 
        purge-client
 
182
                $@
 
183
 
 
184
plugins.d/mandos-client: plugins.d/mandos-client.o
 
185
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
186
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
187
 
 
188
.PHONY : all doc html clean distclean run-client run-server install \
 
189
        install-server install-client uninstall uninstall-server \
 
190
        uninstall-client purge purge-server purge-client
306
191
 
307
192
clean:
308
193
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
310
195
distclean: clean
311
196
mostlyclean: clean
312
197
maintainer-clean: clean
313
 
        -rm --force --recursive keydir confdir statedir
 
198
        -rm --force --recursive keydir confdir
314
199
 
315
 
check: all
 
200
check:  all
316
201
        ./mandos --check
317
 
        ./mandos-ctl --check
318
 
        ./mandos-keygen --version
319
 
        ./plugin-runner --version
320
 
        ./plugin-helpers/mandos-client-iprouteadddel --version
321
 
        ./dracut-module/password-agent --test
322
202
 
323
203
# Run the client with a local config and key
324
 
run-client: all keydir/seckey.txt keydir/pubkey.txt \
325
 
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
326
 
        @echo '######################################################'
327
 
        @echo '# The following error messages are harmless and can  #'
328
 
        @echo '#  be safely ignored:                                #'
329
 
        @echo '## From plugin-runner:                               #'
330
 
        @echo '# setgid: Operation not permitted                    #'
331
 
        @echo '# setuid: Operation not permitted                    #'
332
 
        @echo '## From askpass-fifo:                                #'
333
 
        @echo '# mkfifo: Permission denied                          #'
334
 
        @echo '## From mandos-client:                               #'
335
 
        @echo '# Failed to raise privileges: Operation not permi... #'
336
 
        @echo '# Warning: network hook "*" exited with status *     #'
337
 
        @echo '# ioctl SIOCSIFFLAGS +IFF_UP: Operation not permi... #'
338
 
        @echo '# Failed to bring up interface "*": Operation not... #'
339
 
        @echo '#                                                    #'
340
 
        @echo '# (The messages are caused by not running as root,   #'
341
 
        @echo '# but you should NOT run "make run-client" as root   #'
342
 
        @echo '# unless you also unpacked and compiled Mandos as    #'
343
 
        @echo '# root, which is also NOT recommended.)              #'
344
 
        @echo '######################################################'
345
 
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
 
204
run-client: all keydir/seckey.txt keydir/pubkey.txt
346
205
        ./plugin-runner --plugin-dir=plugins.d \
347
 
                --plugin-helper-dir=plugin-helpers \
348
206
                --config-file=plugin-runner.conf \
349
 
                --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 \
350
 
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
 
207
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
351
208
                $(CLIENTARGS)
352
209
 
353
210
# Used by run-client
354
 
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
 
211
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
355
212
        install --directory keydir
356
213
        ./mandos-keygen --dir keydir --force
357
214
 
358
215
# Run the server with a local config
359
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
360
 
        ./mandos --debug --no-dbus --configdir=confdir \
361
 
                --statedir=statedir $(SERVERARGS)
 
216
run-server: confdir/mandos.conf confdir/clients.conf
 
217
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
362
218
 
363
219
# Used by run-server
364
220
confdir/mandos.conf: mandos.conf
365
221
        install --directory confdir
366
222
        install --mode=u=rw,go=r $^ $@
367
 
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
 
223
confdir/clients.conf: clients.conf keydir/seckey.txt
368
224
        install --directory confdir
369
225
        install --mode=u=rw $< $@
370
226
# Add a client password
371
 
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
372
 
statedir:
373
 
        install --directory statedir
 
227
        ./mandos-keygen --dir keydir --password >> $@
374
228
 
375
229
install: install-server install-client-nokey
376
230
 
381
235
 
382
236
install-server: doc
383
237
        install --directory $(CONFDIR)
384
 
        if install --directory --mode=u=rwx --owner=$(USER) \
385
 
                --group=$(GROUP) $(STATEDIR); then \
386
 
                :; \
387
 
        elif install --directory --mode=u=rwx $(STATEDIR); then \
388
 
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
389
 
        fi
390
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
391
 
                        -a -d "$(TMPFILES)" ]; then \
392
 
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
393
 
                        $(TMPFILES)/mandos.conf; \
394
 
        fi
395
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
396
 
                        -a -d "$(SYSUSERS)" ]; then \
397
 
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
398
 
                        $(SYSUSERS)/mandos.conf; \
399
 
        fi
400
238
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
401
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
402
 
                mandos-ctl
403
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
404
 
                mandos-monitor
405
239
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
406
240
                mandos.conf
407
241
        install --mode=u=rw --target-directory=$(CONFDIR) \
408
242
                clients.conf
409
 
        install --mode=u=rw,go=r dbus-mandos.conf \
410
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
411
243
        install --mode=u=rwx,go=rx init.d-mandos \
412
244
                $(DESTDIR)/etc/init.d/mandos
413
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
414
 
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
415
 
        fi
416
245
        install --mode=u=rw,go=r default-mandos \
417
246
                $(DESTDIR)/etc/default/mandos
418
247
        if [ -z $(DESTDIR) ]; then \
420
249
        fi
421
250
        gzip --best --to-stdout mandos.8 \
422
251
                > $(MANDIR)/man8/mandos.8.gz
423
 
        gzip --best --to-stdout mandos-monitor.8 \
424
 
                > $(MANDIR)/man8/mandos-monitor.8.gz
425
 
        gzip --best --to-stdout mandos-ctl.8 \
426
 
                > $(MANDIR)/man8/mandos-ctl.8.gz
427
252
        gzip --best --to-stdout mandos.conf.5 \
428
253
                > $(MANDIR)/man5/mandos.conf.5.gz
429
254
        gzip --best --to-stdout mandos-clients.conf.5 \
430
255
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
431
 
        gzip --best --to-stdout intro.8mandos \
432
 
                > $(MANDIR)/man8/intro.8mandos.gz
433
256
 
434
257
install-client-nokey: all doc
435
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
258
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
436
259
        install --directory --mode=u=rwx $(KEYDIR) \
437
 
                $(LIBDIR)/mandos/plugins.d \
438
 
                $(LIBDIR)/mandos/plugin-helpers
439
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
440
 
                        -a -d "$(SYSUSERS)" ]; then \
441
 
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
442
 
                        $(SYSUSERS)/mandos-client.conf; \
443
 
        fi
444
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
260
                $(PREFIX)/lib/mandos/plugins.d
 
261
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
445
262
                install --mode=u=rwx \
446
 
                        --directory "$(CONFDIR)/plugins.d" \
447
 
                        "$(CONFDIR)/plugin-helpers"; \
 
263
                        --directory "$(CONFDIR)/plugins.d"; \
448
264
        fi
449
 
        install --mode=u=rwx,go=rx --directory \
450
 
                "$(CONFDIR)/network-hooks.d"
451
 
        install --mode=u=rwx,go=rx \
452
 
                --target-directory=$(LIBDIR)/mandos plugin-runner
453
 
        install --mode=u=rwx,go=rx \
454
 
                --target-directory=$(LIBDIR)/mandos \
455
 
                mandos-to-cryptroot-unlock
 
265
        install --mode=u=rwx,go=rx \
 
266
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
456
267
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
457
268
                mandos-keygen
458
269
        install --mode=u=rwx,go=rx \
459
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
270
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
460
271
                plugins.d/password-prompt
461
272
        install --mode=u=rwxs,go=rx \
462
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
273
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
463
274
                plugins.d/mandos-client
464
275
        install --mode=u=rwxs,go=rx \
465
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
276
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
466
277
                plugins.d/usplash
467
278
        install --mode=u=rwxs,go=rx \
468
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
279
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
469
280
                plugins.d/splashy
470
281
        install --mode=u=rwxs,go=rx \
471
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
282
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
472
283
                plugins.d/askpass-fifo
473
 
        install --mode=u=rwxs,go=rx \
474
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
475
 
                plugins.d/plymouth
476
 
        install --mode=u=rwx,go=rx \
477
 
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
478
 
                plugin-helpers/mandos-client-iprouteadddel
479
284
        install initramfs-tools-hook \
480
285
                $(INITRAMFSTOOLS)/hooks/mandos
481
 
        install --mode=u=rw,go=r initramfs-tools-conf \
482
 
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
483
 
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
484
 
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
 
286
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
287
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
485
288
        install initramfs-tools-script \
486
289
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
487
 
        install initramfs-tools-script-stop \
488
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
489
 
        install --directory $(DRACUTMODULE)
490
 
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
491
 
                dracut-module/ask-password-mandos.path \
492
 
                dracut-module/ask-password-mandos.service
493
 
        install --mode=u=rwxs,go=rx \
494
 
                --target-directory=$(DRACUTMODULE) \
495
 
                dracut-module/module-setup.sh \
496
 
                dracut-module/cmdline-mandos.sh \
497
 
                dracut-module/password-agent
498
290
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
499
291
        gzip --best --to-stdout mandos-keygen.8 \
500
292
                > $(MANDIR)/man8/mandos-keygen.8.gz
501
293
        gzip --best --to-stdout plugin-runner.8mandos \
502
294
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
295
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
296
                > $(MANDIR)/man8/password-prompt.8mandos.gz
503
297
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
504
298
                > $(MANDIR)/man8/mandos-client.8mandos.gz
505
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
506
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
507
299
        gzip --best --to-stdout plugins.d/usplash.8mandos \
508
300
                > $(MANDIR)/man8/usplash.8mandos.gz
509
301
        gzip --best --to-stdout plugins.d/splashy.8mandos \
510
302
                > $(MANDIR)/man8/splashy.8mandos.gz
511
303
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
512
304
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
513
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
514
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
515
 
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
516
 
                > $(MANDIR)/man8/password-agent.8mandos.gz
517
305
 
518
306
install-client: install-client-nokey
519
307
# Post-installation stuff
520
308
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
521
 
        if command -v update-initramfs >/dev/null; then \
522
 
            update-initramfs -k all -u; \
523
 
        elif command -v dracut >/dev/null; then \
524
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
525
 
                if [ -w "$$initrd" ]; then \
526
 
                    chmod go-r "$$initrd"; \
527
 
                    dracut --force "$$initrd"; \
528
 
                fi; \
529
 
            done; \
530
 
        fi
 
309
        update-initramfs -k all -u
531
310
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
532
311
 
533
312
uninstall: uninstall-server uninstall-client
534
313
 
535
314
uninstall-server:
536
315
        -rm --force $(PREFIX)/sbin/mandos \
537
 
                $(PREFIX)/sbin/mandos-ctl \
538
 
                $(PREFIX)/sbin/mandos-monitor \
539
316
                $(MANDIR)/man8/mandos.8.gz \
540
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
541
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
542
317
                $(MANDIR)/man5/mandos.conf.5.gz \
543
318
                $(MANDIR)/man5/mandos-clients.conf.5.gz
544
319
        update-rc.d -f mandos remove
550
325
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
551
326
                $(DESTDIR)/etc/crypttab
552
327
        -rm --force $(PREFIX)/sbin/mandos-keygen \
553
 
                $(LIBDIR)/mandos/plugin-runner \
554
 
                $(LIBDIR)/mandos/plugins.d/password-prompt \
555
 
                $(LIBDIR)/mandos/plugins.d/mandos-client \
556
 
                $(LIBDIR)/mandos/plugins.d/usplash \
557
 
                $(LIBDIR)/mandos/plugins.d/splashy \
558
 
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
559
 
                $(LIBDIR)/mandos/plugins.d/plymouth \
 
328
                $(PREFIX)/lib/mandos/plugin-runner \
 
329
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
 
330
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
 
331
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
332
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
333
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
560
334
                $(INITRAMFSTOOLS)/hooks/mandos \
561
335
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
562
336
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
563
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos \
564
 
                $(DRACUTMODULE)/ask-password-mandos.path \
565
 
                $(DRACUTMODULE)/ask-password-mandos.service \
566
 
                $(DRACUTMODULE)/module-setup.sh \
567
 
                $(DRACUTMODULE)/cmdline-mandos.sh \
568
 
                $(DRACUTMODULE)/password-agent \
 
337
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
569
338
                $(MANDIR)/man8/mandos-keygen.8.gz \
570
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
571
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
572
339
                $(MANDIR)/man8/password-prompt.8mandos.gz \
573
340
                $(MANDIR)/man8/usplash.8mandos.gz \
574
341
                $(MANDIR)/man8/splashy.8mandos.gz \
575
342
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
576
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
577
 
                $(MANDIR)/man8/password-agent.8mandos.gz \
578
 
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
579
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR) $(DRACUTMODULE)
580
 
        if command -v update-initramfs >/dev/null; then \
581
 
            update-initramfs -k all -u; \
582
 
        elif command -v dracut >/dev/null; then \
583
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
584
 
                test -w "$$initrd" && dracut --force "$$initrd"; \
585
 
            done; \
586
 
        fi
 
343
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
344
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
345
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
346
        update-initramfs -k all -u
587
347
 
588
348
purge: purge-server purge-client
589
349
 
590
350
purge-server: uninstall-server
591
351
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
592
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
593
352
                $(DESTDIR)/etc/default/mandos \
594
353
                $(DESTDIR)/etc/init.d/mandos \
595
 
                $(SYSTEMD)/mandos.service \
596
 
                $(DESTDIR)/run/mandos.pid \
597
354
                $(DESTDIR)/var/run/mandos.pid
598
355
        -rmdir $(CONFDIR)
599
356
 
600
357
purge-client: uninstall-client
601
 
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
 
358
        -shred --remove $(KEYDIR)/seckey.txt
602
359
        -rm --force $(CONFDIR)/plugin-runner.conf \
603
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
604
 
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
 
360
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
605
361
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)