/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 debian/mandos.postinst

  • Committer: Teddy Hogeborn
  • Date: 2014-06-14 22:55:11 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 317.
  • 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:
34
34
                --home /nonexistent --no-create-home --group \
35
35
                --disabled-password --gecos "Mandos password system" \
36
36
                _mandos
37
 
        elif dpkg --compare-versions "$2" eq 1.7.4-1 \
38
 
                || dpkg --compare-versions "$2" eq "1.7.4-1~bpo8+1"
39
 
        then
40
 
            start=no
41
 
            if ! [ -f /var/lib/mandos/clients.pickle ]; then
42
 
                invoke-rc.d mandos stop
43
 
                start=yes
44
 
            fi
45
 
            chown _mandos:_mandos /var/lib/mandos/clients.pickle \
46
 
                  2>/dev/null || :
47
 
            if [ "$start" = yes ]; then
48
 
                invoke-rc.d mandos start
49
 
            fi
50
 
        fi
51
 
        if ! dpkg-statoverride --list "/var/lib/mandos" >/dev/null \
52
 
             2>&1; then
53
 
            chown _mandos:_mandos /var/lib/mandos
54
 
            chmod u=rwx,go= /var/lib/mandos
55
 
        fi
 
37
        fi
 
38
        chown _mandos:_mandos /var/lib/mandos
56
39
        ;;
57
40
    
58
41
    abort-upgrade|abort-deconfigure|abort-remove)