/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 debian/rules

  • Committer: Teddy Hogeborn
  • Date: 2014-06-14 22:55:11 UTC
  • Revision ID: teddy@recompile.se-20140614225511-0ge6tce2esulf65t
In plugin-runner, do scandirat() or scandir() instead of readdir().

* plugin-runner.c (set_cloexec_flag): Only define if O_CLOEXEC is not
                                      defined, it is not called
                                      otherwise.
  (main): Remove variables "dir" and "dirst"; new variable "dir_fd".
          Use scandirat() if available, scandir() otherwise, both
          using new filter function "good_name".  Removed checking of
          plugin file name patterns; this is now done by "good_name".
          Do not set FD_CLOEXEC flag on plugin_fd, since fexecve()
          will not work with it.  Use pipe2() to set O_CLOEXEC on pipe
          FD's (if possible).
  (main/good_name): New filter function for scandirat() or scandir().

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
19
19
        $(MAKE) DESTDIR=$(CURDIR)/debian/mandos-client \
20
20
                install-client-nokey
21
21
 
22
 
override_dh_fixperms-arch:
 
22
override_dh_fixperms:
23
23
        dh_fixperms --exclude etc/keys/mandos \
 
24
                --exclude etc/mandos/clients.conf \
24
25
                --exclude etc/mandos/plugins.d \
25
 
                --exclude etc/mandos/plugin-helpers \
26
26
                --exclude usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)/mandos/plugins.d \
27
 
                --exclude usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)/mandos/plugin-helpers \
28
27
                --exclude usr/share/doc/mandos-client/examples/network-hooks.d
29
28
        chmod --recursive g-w -- \
30
29
        "$(CURDIR)/debian/mandos-client/usr/share/doc/mandos-client/examples/network-hooks.d"
31
30
 
32
 
override_dh_fixperms-indep:
33
 
        dh_fixperms --exclude etc/mandos/clients.conf
34
 
 
35
31
override_dh_auto_test-arch: ;