/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2014-06-14 02:57:16 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 317.
  • Revision ID: teddy@recompile.se-20140614025716-i6887rk3u1iy9l67
In plugin-runner, protect against a larger FD_SETSIZE than fd_set.

* plugin-runner.c (main): Before forking, check that the first FD from
                          pipe() does not exceed FD_SETSIZE.

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.9
 
29
version=1.6.5
30
30
SED=sed
31
31
 
32
32
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
106
106
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
107
107
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
108
108
        plugins.d/plymouth
109
 
PLUGIN_HELPERS=
110
 
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
109
CPROGS=plugin-runner $(PLUGINS)
111
110
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
112
111
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
113
112
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
265
264
        @echo "# ignored.  The messages are caused by not running as root, but   #"
266
265
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
267
266
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
268
 
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
269
 
        @echo "#                     setuid: Operation not permitted             #"
 
267
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
270
268
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
271
 
        @echo "# From mandos-client:                                             #"
272
 
        @echo "#             Failed to raise privileges: Operation not permitted #"
273
 
        @echo "#             Warning: network hook \"*\" exited with status *      #"
 
269
        @echo "# From mandos-client: setuid: Operation not permitted             #"
 
270
        @echo "#                     seteuid: Operation not permitted            #"
 
271
        @echo "#                     klogctl: Operation not permitted            #"
274
272
        @echo "###################################################################"
275
 
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
276
273
        ./plugin-runner --plugin-dir=plugins.d \
277
 
                --plugin-helper-dir=plugin-helpers \
278
274
                --config-file=plugin-runner.conf \
279
275
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
280
 
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
281
276
                $(CLIENTARGS)
282
277
 
283
278
# Used by run-client
298
293
        install --directory confdir
299
294
        install --mode=u=rw $< $@
300
295
# Add a client password
301
 
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
 
296
        ./mandos-keygen --dir keydir --password >> $@
302
297
statedir:
303
298
        install --directory statedir
304
299
 
358
353
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
359
354
                install --mode=u=rwx \
360
355
                        --directory "$(CONFDIR)/plugins.d"; \
361
 
                install --directory "$(CONFDIR)/plugin-helpers"; \
362
356
        fi
363
357
        install --mode=u=rwx,go=rx --directory \
364
358
                "$(CONFDIR)/network-hooks.d"