/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
 
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
 
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var \
 
8
        -Wunreachable-code
13
9
#DEBUG=-ggdb3
14
10
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
15
11
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
23
19
LINK_FORTIFY += -pie
24
20
endif
25
21
#COVERAGE=--coverage
26
 
OPTIMIZE=-Os -fno-strict-aliasing
27
 
LANGUAGE=-std=gnu11
 
22
OPTIMIZE=-Os
 
23
LANGUAGE=-std=gnu99
28
24
htmldir=man
29
 
version=1.6.9
 
25
version=1.6.4
30
26
SED=sed
31
27
 
32
28
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
69
65
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
70
66
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
71
67
        getconf LFS_LDFLAGS)
72
 
LIBNL3_CFLAGS=$(shell pkg-config --cflags-only-I libnl-route-3.0)
73
 
LIBNL3_LIBS=$(shell pkg-config --libs libnl-route-3.0)
74
68
 
75
69
# Do not change these two
76
70
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
87
81
        --param man.authors.section.enabled     0 \
88
82
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
89
83
        $(notdir $<); \
 
84
        $(MANPOST) $(notdir $@);\
90
85
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
91
86
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
92
87
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
93
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'
94
91
 
95
92
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
96
93
        --param make.year.ranges                1 \
108
105
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
109
106
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
110
107
        plugins.d/plymouth
111
 
PLUGIN_HELPERS=plugin-helpers/mandos-client-iprouteadddel
112
 
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
108
CPROGS=plugin-runner $(PLUGINS)
113
109
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
114
110
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
115
111
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
242
238
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
243
239
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
244
240
 
245
 
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
246
 
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
247
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
248
 
 
249
241
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
250
242
        check run-client run-server install install-html \
251
243
        install-server install-client-nokey install-client uninstall \
271
263
        @echo "# ignored.  The messages are caused by not running as root, but   #"
272
264
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
273
265
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
274
 
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
275
 
        @echo "#                     setuid: Operation not permitted             #"
 
266
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
276
267
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
277
 
        @echo "# From mandos-client:                                             #"
278
 
        @echo "#             Failed to raise privileges: Operation not permitted #"
279
 
        @echo "#             Warning: network hook \"*\" exited with status *      #"
 
268
        @echo "# From mandos-client: setuid: Operation not permitted             #"
 
269
        @echo "#                     seteuid: Operation not permitted            #"
 
270
        @echo "#                     klogctl: Operation not permitted            #"
280
271
        @echo "###################################################################"
281
 
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
282
272
        ./plugin-runner --plugin-dir=plugins.d \
283
 
                --plugin-helper-dir=plugin-helpers \
284
273
                --config-file=plugin-runner.conf \
285
274
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
286
 
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
287
275
                $(CLIENTARGS)
288
276
 
289
277
# Used by run-client
304
292
        install --directory confdir
305
293
        install --mode=u=rw $< $@
306
294
# Add a client password
307
 
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
 
295
        ./mandos-keygen --dir keydir --password >> $@
308
296
statedir:
309
297
        install --directory statedir
310
298
 
360
348
install-client-nokey: all doc
361
349
        install --directory $(LIBDIR)/mandos $(CONFDIR)
362
350
        install --directory --mode=u=rwx $(KEYDIR) \
363
 
                $(LIBDIR)/mandos/plugins.d \
364
 
                $(LIBDIR)/mandos/plugin-helpers
 
351
                $(LIBDIR)/mandos/plugins.d
365
352
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
366
353
                install --mode=u=rwx \
367
354
                        --directory "$(CONFDIR)/plugins.d"; \
368
 
                install --directory "$(CONFDIR)/plugin-helpers"; \
369
355
        fi
370
356
        install --mode=u=rwx,go=rx --directory \
371
357
                "$(CONFDIR)/network-hooks.d"
391
377
        install --mode=u=rwxs,go=rx \
392
378
                --target-directory=$(LIBDIR)/mandos/plugins.d \
393
379
                plugins.d/plymouth
394
 
        install --mode=u=rwxs,go=rx \
395
 
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
396
 
                plugin-helpers/mandos-client-iprouteadddel
397
380
        install initramfs-tools-hook \
398
381
                $(INITRAMFSTOOLS)/hooks/mandos
399
382
        install --mode=u=rw,go=r initramfs-tools-hook-conf \