/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: 2017-06-24 10:08:21 UTC
  • Revision ID: teddy@recompile.se-20170624100821-3ojepr4r6sifqzj5
Fix memory leak in password-prompt

* plugins.d/password-prompt.c (conflict_detection): Free any
  individual direntries, not just the direntry list.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
10
10
        -Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
11
11
        -Wredundant-decls -Wnested-externs -Winline -Wvla \
12
12
        -Wvolatile-register-var -Woverlength-strings
13
 
#DEBUG=-ggdb3
 
13
#DEBUG=-ggdb3 -fsanitize=address 
14
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
15
 
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
15
# and <https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
16
16
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
17
17
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
18
 
ALL_SANITIZE_OPTIONS:=-fsanitize=address -fsanitize=undefined \
 
18
ALL_SANITIZE_OPTIONS:=-fsanitize=leak -fsanitize=undefined \
19
19
        -fsanitize=shift -fsanitize=integer-divide-by-zero \
20
20
        -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null \
21
21
        -fsanitize=return -fsanitize=signed-integer-overflow \
40
40
OPTIMIZE=-Os -fno-strict-aliasing
41
41
LANGUAGE=-std=gnu11
42
42
htmldir=man
43
 
version=1.7.6
 
43
version=1.7.15
44
44
SED=sed
45
45
 
46
46
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
283
283
run-client: all keydir/seckey.txt keydir/pubkey.txt
284
284
        @echo "###################################################################"
285
285
        @echo "# The following error messages are harmless and can be safely     #"
286
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
287
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
288
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
 
286
        @echo "# ignored:                                                        #"
289
287
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
290
288
        @echo "#                     setuid: Operation not permitted             #"
291
289
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
292
290
        @echo "# From mandos-client:                                             #"
293
291
        @echo "#             Failed to raise privileges: Operation not permitted #"
294
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.)        #"
295
297
        @echo "###################################################################"
296
298
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
297
299
        ./plugin-runner --plugin-dir=plugins.d \
339
341
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
340
342
        fi
341
343
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
342
 
                install --mode=u=rwx,go=r tmpfiles.d-mandos.conf \
 
344
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
343
345
                        $(TMPFILES)/mandos.conf; \
344
346
        fi
345
347
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
383
385
                $(LIBDIR)/mandos/plugin-helpers
384
386
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
385
387
                install --mode=u=rwx \
386
 
                        --directory "$(CONFDIR)/plugins.d"; \
387
 
                install --directory "$(CONFDIR)/plugin-helpers"; \
 
388
                        --directory "$(CONFDIR)/plugins.d" \
 
389
                        "$(CONFDIR)/plugin-helpers"; \
388
390
        fi
389
391
        install --mode=u=rwx,go=rx --directory \
390
392
                "$(CONFDIR)/network-hooks.d"