/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
 
#DEBUG=-ggdb3 -fsanitize=address 
 
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
 
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var \
 
8
        -Wunreachable-code
 
9
#DEBUG=-ggdb3
14
10
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
15
 
# and <https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
11
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
16
12
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)))
31
13
LINK_FORTIFY_LD=-z relro -z now
32
14
LINK_FORTIFY=
33
15
 
37
19
LINK_FORTIFY += -pie
38
20
endif
39
21
#COVERAGE=--coverage
40
 
OPTIMIZE=-Os -fno-strict-aliasing
41
 
LANGUAGE=-std=gnu11
 
22
OPTIMIZE=-Os
 
23
LANGUAGE=-std=gnu99
42
24
htmldir=man
43
 
version=1.7.14
 
25
version=1.6.4
44
26
SED=sed
45
27
 
46
28
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)))
 
29
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
48
30
 
49
31
## Use these settings for a traditional /usr/local install
50
32
# PREFIX=$(DESTDIR)/usr/local
75
57
##
76
58
 
77
59
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
78
 
TMPFILES=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
79
60
 
80
61
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
81
62
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
84
65
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
85
66
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
86
67
        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)
89
68
 
90
69
# Do not change these two
91
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(SANITIZE) $(COVERAGE) \
92
 
        $(OPTIMIZE) $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) \
93
 
        $(GPGME_CFLAGS) -DVERSION='"$(version)"'
 
70
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
71
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
 
72
        -DVERSION='"$(version)"'
94
73
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
95
74
 
96
75
# Commands to format a DocBook <refentry> document into a manual page
102
81
        --param man.authors.section.enabled     0 \
103
82
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
104
83
        $(notdir $<); \
 
84
        $(MANPOST) $(notdir $@);\
105
85
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
106
86
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
107
87
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
108
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'
109
91
 
110
92
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
111
93
        --param make.year.ranges                1 \
123
105
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
124
106
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
125
107
        plugins.d/plymouth
126
 
PLUGIN_HELPERS=plugin-helpers/mandos-client-iprouteadddel
127
 
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
108
CPROGS=plugin-runner $(PLUGINS)
128
109
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
129
110
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
130
111
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
257
238
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
258
239
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
259
240
 
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
241
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
265
242
        check run-client run-server install install-html \
266
243
        install-server install-client-nokey install-client uninstall \
283
260
run-client: all keydir/seckey.txt keydir/pubkey.txt
284
261
        @echo "###################################################################"
285
262
        @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             #"
 
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             #"
289
267
        @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.)        #"
 
268
        @echo "# From mandos-client: setuid: Operation not permitted             #"
 
269
        @echo "#                     seteuid: Operation not permitted            #"
 
270
        @echo "#                     klogctl: Operation not permitted            #"
297
271
        @echo "###################################################################"
298
 
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
299
272
        ./plugin-runner --plugin-dir=plugins.d \
300
 
                --plugin-helper-dir=plugin-helpers \
301
273
                --config-file=plugin-runner.conf \
302
274
                --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= \
304
275
                $(CLIENTARGS)
305
276
 
306
277
# Used by run-client
321
292
        install --directory confdir
322
293
        install --mode=u=rw $< $@
323
294
# Add a client password
324
 
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
 
295
        ./mandos-keygen --dir keydir --password >> $@
325
296
statedir:
326
297
        install --directory statedir
327
298
 
340
311
        elif install --directory --mode=u=rwx $(STATEDIR); then \
341
312
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
342
313
        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
347
314
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
348
315
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
349
316
                mandos-ctl
381
348
install-client-nokey: all doc
382
349
        install --directory $(LIBDIR)/mandos $(CONFDIR)
383
350
        install --directory --mode=u=rwx $(KEYDIR) \
384
 
                $(LIBDIR)/mandos/plugins.d \
385
 
                $(LIBDIR)/mandos/plugin-helpers
 
351
                $(LIBDIR)/mandos/plugins.d
386
352
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
387
353
                install --mode=u=rwx \
388
 
                        --directory "$(CONFDIR)/plugins.d" \
389
 
                        "$(CONFDIR)/plugin-helpers"; \
 
354
                        --directory "$(CONFDIR)/plugins.d"; \
390
355
        fi
391
356
        install --mode=u=rwx,go=rx --directory \
392
357
                "$(CONFDIR)/network-hooks.d"
412
377
        install --mode=u=rwxs,go=rx \
413
378
                --target-directory=$(LIBDIR)/mandos/plugins.d \
414
379
                plugins.d/plymouth
415
 
        install --mode=u=rwx,go=rx \
416
 
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
417
 
                plugin-helpers/mandos-client-iprouteadddel
418
380
        install initramfs-tools-hook \
419
381
                $(INITRAMFSTOOLS)/hooks/mandos
420
382
        install --mode=u=rw,go=r initramfs-tools-hook-conf \