/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-07-15 19:35:03 UTC
  • Revision ID: teddy@recompile.se-20140715193503-e18hls7m4rv4l6iq
mandos-client: Fix mem free bug.

* plugins.d/mandos-client.c (add_server): Hide warning.
  (main): Free server->ip too, not just the server struct.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
26
26
OPTIMIZE=-Os -fno-strict-aliasing
27
27
LANGUAGE=-std=gnu99
28
28
htmldir=man
29
 
version=1.6.4
 
29
version=1.6.6
30
30
SED=sed
31
31
 
32
32
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
85
85
        --param man.authors.section.enabled     0 \
86
86
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
87
87
        $(notdir $<); \
88
 
        $(MANPOST) $(notdir $@);\
89
88
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
90
89
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
91
90
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
92
91
        fi >/dev/null)
93
 
# DocBook-to-man post-processing to fix a '\n' escape bug
94
 
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
95
92
 
96
93
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
97
94
        --param make.year.ranges                1 \
267
264
        @echo "# ignored.  The messages are caused by not running as root, but   #"
268
265
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
269
266
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
270
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
 
267
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
 
268
        @echo "#                     setuid: Operation not permitted             #"
271
269
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
272
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
273
 
        @echo "#                     seteuid: Operation not permitted            #"
274
 
        @echo "#                     klogctl: Operation not permitted            #"
 
270
        @echo "# From mandos-client:                                             #"
 
271
        @echo "#             Failed to raise privileges: Operation not permitted #"
 
272
        @echo "#             Warning: network hook \"*\" exited with status *      #"
275
273
        @echo "###################################################################"
 
274
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
276
275
        ./plugin-runner --plugin-dir=plugins.d \
277
276
                --config-file=plugin-runner.conf \
278
277
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
278
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
279
279
                $(CLIENTARGS)
280
280
 
281
281
# Used by run-client
296
296
        install --directory confdir
297
297
        install --mode=u=rw $< $@
298
298
# Add a client password
299
 
        ./mandos-keygen --dir keydir --password >> $@
 
299
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
300
300
statedir:
301
301
        install --directory statedir
302
302