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
- browse files at revision 916
- compare with another revision
- download diff
- download tarball
- view history from revision 916
- Committer: Teddy Hogeborn
- Date: 2018-01-29 19:21:23 UTC
- Revision ID: teddy@recompile.se-20180129192123-y6brq6tnnnxm2oi2
Fix memory leak in plugin-runner (this fixes Debian bug #886595)
* plugin-runner.c (free_plugin): Bug fix: Also free() plugin name.
* plugin-runner.c (free_plugin): Bug fix: Also free() plugin name.
- files added:
- bugs.xml
- debian/upstream
- network-hooks.d
- plugin-helpers
- files modified:
- .bzrignore
added
removed
Makefile
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
-Wswitch-default -Wswitch-enum -Wunused-parameter \
3
-Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
1
WARN=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
2
-Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
3
-Wunused -Wuninitialized -Wstrict-overflow=5 \
4
-Wsuggest-attribute=pure -Wsuggest-attribute=const \
5
-Wsuggest-attribute=noreturn -Wfloat-equal -Wundef -Wshadow \
4
6
-Wunsafe-loop-optimizations -Wpointer-arith \
5
7
-Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
-Wconversion -Wstrict-prototypes -Wold-style-definition \
7
-Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
# -Wunreachable-code
9
#DEBUG=-ggdb3
10
# For info about _FORTIFY_SOURCE, see
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
12
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
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
#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>.
13
16
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
17
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
18
ALL_SANITIZE_OPTIONS:=-fsanitize=leak -fsanitize=undefined \
19
-fsanitize=shift -fsanitize=integer-divide-by-zero \
20
-fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null \
21
-fsanitize=return -fsanitize=signed-integer-overflow \
22
-fsanitize=bounds -fsanitize=alignment \
23
-fsanitize=object-size -fsanitize=float-divide-by-zero \
24
-fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
25
-fsanitize=returns-nonnull-attribute -fsanitize=bool \
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)))
14
31
LINK_FORTIFY_LD=-z relro -z now
15
32
LINK_FORTIFY=
16
33
20
37
LINK_FORTIFY += -pie
21
38
endif
22
39
#COVERAGE=--coverage
23
OPTIMIZE=-Os
24
LANGUAGE=-std=gnu99
40
OPTIMIZE=-Os -fno-strict-aliasing
41
LANGUAGE=-std=gnu11
25
42
htmldir=man
26
version=1.4.1
43
version=1.7.16
27
44
SED=sed
28
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)))
48
29
49
## Use these settings for a traditional /usr/local install
30
50
# PREFIX=$(DESTDIR)/usr/local
31
51
# CONFDIR=$(DESTDIR)/etc/mandos
32
52
# KEYDIR=$(DESTDIR)/etc/mandos/keys
33
53
# MANDIR=$(PREFIX)/man
34
54
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
55
# STATEDIR=$(DESTDIR)/var/lib/mandos
56
# LIBDIR=$(PREFIX)/lib
35
57
##
36
58
37
59
## These settings are for a package-type install
40
62
KEYDIR=$(DESTDIR)/etc/keys/mandos
41
63
MANDIR=$(PREFIX)/share/man
42
64
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
65
STATEDIR=$(DESTDIR)/var/lib/mandos
66
LIBDIR=$(shell \
67
for d in \
68
"/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
69
"`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
70
if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
71
echo "$(DESTDIR)$$d"; \
72
break; \
73
fi; \
74
done)
43
75
##
44
76
77
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
78
TMPFILES=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
79
45
80
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
46
81
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
47
82
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
49
84
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
50
85
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
51
86
getconf LFS_LDFLAGS)
87
LIBNL3_CFLAGS=$(shell pkg-config --cflags-only-I libnl-route-3.0)
88
LIBNL3_LIBS=$(shell pkg-config --libs libnl-route-3.0)
52
89
53
90
# Do not change these two
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
$(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
-DVERSION='"$(version)"'
57
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(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))
58
95
59
96
# Commands to format a DocBook <refentry> document into a manual page
60
97
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
63
100
--param make.single.year.ranges 1 \
64
101
--param man.output.quietly 1 \
65
102
--param man.authors.section.enabled 0 \
66
/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
103
/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
104
$(notdir $<); \
68
$(MANPOST) $(notdir $@);\
69
LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
70
--local-file $(notdir $@) >/dev/null)
71
# DocBook-to-man post-processing to fix a '\n' escape bug
72
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
105
if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
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)
73
109
74
110
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
75
111
--param make.year.ranges 1 \
87
123
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
88
124
plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
89
125
plugins.d/plymouth
90
CPROGS=plugin-runner $(PLUGINS)
126
PLUGIN_HELPERS=plugin-helpers/mandos-client-iprouteadddel
127
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
91
128
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
92
129
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
93
130
mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
220
257
$(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
221
258
) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
222
259
223
.PHONY : all doc html clean distclean run-client run-server install \
224
install-server install-client uninstall uninstall-server \
225
uninstall-client purge purge-server purge-client
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
226
269
227
270
clean:
228
271
-rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
230
273
distclean: clean
231
274
mostlyclean: clean
232
275
maintainer-clean: clean
233
-rm --force --recursive keydir confdir
276
-rm --force --recursive keydir confdir statedir
234
277
235
278
check: all
236
279
./mandos --check
280
./mandos-ctl --check
237
281
238
282
# Run the client with a local config and key
239
283
run-client: all keydir/seckey.txt keydir/pubkey.txt
240
284
@echo "###################################################################"
241
285
@echo "# The following error messages are harmless and can be safely #"
242
@echo "# ignored. The messages are caused by not running as root, but #"
243
@echo "# you should NOT run \"make run-client\" as root unless you also #"
244
@echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
245
@echo "# From plugin-runner: setuid: Operation not permitted #"
286
@echo "# ignored: #"
287
@echo "# From plugin-runner: setgid: Operation not permitted #"
288
@echo "# setuid: Operation not permitted #"
246
289
@echo "# From askpass-fifo: mkfifo: Permission denied #"
247
@echo "# From mandos-client: setuid: Operation not permitted #"
248
@echo "# seteuid: Operation not permitted #"
249
@echo "# klogctl: Operation not permitted #"
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.) #"
250
297
@echo "###################################################################"
298
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
251
299
./plugin-runner --plugin-dir=plugins.d \
300
--plugin-helper-dir=plugin-helpers \
252
301
--config-file=plugin-runner.conf \
253
--options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
302
--options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
303
--env-for=mandos-client:GNOME_KEYRING_CONTROL= \
254
304
$(CLIENTARGS)
255
305
256
306
# Used by run-client
259
309
./mandos-keygen --dir keydir --force
260
310
261
311
# Run the server with a local config
262
run-server: confdir/mandos.conf confdir/clients.conf
263
./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
312
run-server: confdir/mandos.conf confdir/clients.conf statedir
313
./mandos --debug --no-dbus --configdir=confdir \
314
--statedir=statedir $(SERVERARGS)
264
315
265
316
# Used by run-server
266
317
confdir/mandos.conf: mandos.conf
270
321
install --directory confdir
271
322
install --mode=u=rw $< $@
272
323
# Add a client password
273
./mandos-keygen --dir keydir --password >> $@
324
./mandos-keygen --dir keydir --password --no-ssh >> $@
325
statedir:
326
install --directory statedir
274
327
275
328
install: install-server install-client-nokey
276
329
281
334
282
335
install-server: doc
283
336
install --directory $(CONFDIR)
337
if install --directory --mode=u=rwx --owner=$(USER) \
338
--group=$(GROUP) $(STATEDIR); then \
339
:; \
340
elif install --directory --mode=u=rwx $(STATEDIR); then \
341
chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
342
fi
343
if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
344
install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
345
$(TMPFILES)/mandos.conf; \
346
fi
284
347
install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
285
348
install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
286
349
mandos-ctl
294
357
$(DESTDIR)/etc/dbus-1/system.d/mandos.conf
295
358
install --mode=u=rwx,go=rx init.d-mandos \
296
359
$(DESTDIR)/etc/init.d/mandos
360
if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
361
install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
362
fi
297
363
install --mode=u=rw,go=r default-mandos \
298
364
$(DESTDIR)/etc/default/mandos
299
365
if [ -z $(DESTDIR) ]; then \
309
375
> $(MANDIR)/man5/mandos.conf.5.gz
310
376
gzip --best --to-stdout mandos-clients.conf.5 \
311
377
> $(MANDIR)/man5/mandos-clients.conf.5.gz
378
gzip --best --to-stdout intro.8mandos \
379
> $(MANDIR)/man8/intro.8mandos.gz
312
380
313
381
install-client-nokey: all doc
314
install --directory $(PREFIX)/lib/mandos $(CONFDIR)
382
install --directory $(LIBDIR)/mandos $(CONFDIR)
315
383
install --directory --mode=u=rwx $(KEYDIR) \
316
$(PREFIX)/lib/mandos/plugins.d
317
if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
384
$(LIBDIR)/mandos/plugins.d \
385
$(LIBDIR)/mandos/plugin-helpers
386
if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
318
387
install --mode=u=rwx \
319
--directory "$(CONFDIR)/plugins.d"; \
388
--directory "$(CONFDIR)/plugins.d" \
389
"$(CONFDIR)/plugin-helpers"; \
320
390
fi
391
install --mode=u=rwx,go=rx --directory \
392
"$(CONFDIR)/network-hooks.d"
321
393
install --mode=u=rwx,go=rx \
322
--target-directory=$(PREFIX)/lib/mandos plugin-runner
394
--target-directory=$(LIBDIR)/mandos plugin-runner
323
395
install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
324
396
mandos-keygen
325
397
install --mode=u=rwx,go=rx \
326
--target-directory=$(PREFIX)/lib/mandos/plugins.d \
398
--target-directory=$(LIBDIR)/mandos/plugins.d \
327
399
plugins.d/password-prompt
328
400
install --mode=u=rwxs,go=rx \
329
--target-directory=$(PREFIX)/lib/mandos/plugins.d \
401
--target-directory=$(LIBDIR)/mandos/plugins.d \
330
402
plugins.d/mandos-client
331
403
install --mode=u=rwxs,go=rx \
332
--target-directory=$(PREFIX)/lib/mandos/plugins.d \
404
--target-directory=$(LIBDIR)/mandos/plugins.d \
333
405
plugins.d/usplash
334
406
install --mode=u=rwxs,go=rx \
335
--target-directory=$(PREFIX)/lib/mandos/plugins.d \
407
--target-directory=$(LIBDIR)/mandos/plugins.d \
336
408
plugins.d/splashy
337
409
install --mode=u=rwxs,go=rx \
338
--target-directory=$(PREFIX)/lib/mandos/plugins.d \
410
--target-directory=$(LIBDIR)/mandos/plugins.d \
339
411
plugins.d/askpass-fifo
340
412
install --mode=u=rwxs,go=rx \
341
--target-directory=$(PREFIX)/lib/mandos/plugins.d \
413
--target-directory=$(LIBDIR)/mandos/plugins.d \
342
414
plugins.d/plymouth
415
install --mode=u=rwx,go=rx \
416
--target-directory=$(LIBDIR)/mandos/plugin-helpers \
417
plugin-helpers/mandos-client-iprouteadddel
343
418
install initramfs-tools-hook \
344
419
$(INITRAMFSTOOLS)/hooks/mandos
345
420
install --mode=u=rw,go=r initramfs-tools-hook-conf \
390
465
! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
391
466
$(DESTDIR)/etc/crypttab
392
467
-rm --force $(PREFIX)/sbin/mandos-keygen \
393
$(PREFIX)/lib/mandos/plugin-runner \
394
$(PREFIX)/lib/mandos/plugins.d/password-prompt \
395
$(PREFIX)/lib/mandos/plugins.d/mandos-client \
396
$(PREFIX)/lib/mandos/plugins.d/usplash \
397
$(PREFIX)/lib/mandos/plugins.d/splashy \
398
$(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
399
$(PREFIX)/lib/mandos/plugins.d/plymouth \
468
$(LIBDIR)/mandos/plugin-runner \
469
$(LIBDIR)/mandos/plugins.d/password-prompt \
470
$(LIBDIR)/mandos/plugins.d/mandos-client \
471
$(LIBDIR)/mandos/plugins.d/usplash \
472
$(LIBDIR)/mandos/plugins.d/splashy \
473
$(LIBDIR)/mandos/plugins.d/askpass-fifo \
474
$(LIBDIR)/mandos/plugins.d/plymouth \
400
475
$(INITRAMFSTOOLS)/hooks/mandos \
401
476
$(INITRAMFSTOOLS)/conf-hooks.d/mandos \
402
477
$(INITRAMFSTOOLS)/scripts/init-premount/mandos \
408
483
$(MANDIR)/man8/splashy.8mandos.gz \
409
484
$(MANDIR)/man8/askpass-fifo.8mandos.gz \
410
485
$(MANDIR)/man8/plymouth.8mandos.gz \
411
-rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
412
$(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
486
-rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
487
$(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
413
488
update-initramfs -k all -u
414
489
415
490
purge: purge-server purge-client
419
494
$(DESTDIR)/etc/dbus-1/system.d/mandos.conf
420
495
$(DESTDIR)/etc/default/mandos \
421
496
$(DESTDIR)/etc/init.d/mandos \
497
$(SYSTEMD)/mandos.service \
498
$(DESTDIR)/run/mandos.pid \
422
499
$(DESTDIR)/var/run/mandos.pid
423
500
-rmdir $(CONFDIR)
424
501
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0