/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/mandos-client.postrm

  • 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:
31
31
# Update the initial RAM file system image
32
32
update_initramfs()
33
33
{
34
 
    update-initramfs -u -k all || :
 
34
    if [ -x /usr/sbin/update-initramfs ]; then
 
35
        update-initramfs -u -k all
 
36
    fi
35
37
}
36
38
 
37
39
case "$1" in
43
45
        shred --remove /etc/keys/mandos/seckey.txt 2>/dev/null || :
44
46
        rm --force /etc/mandos/plugin-runner.conf \
45
47
            /etc/keys/mandos/pubkey.txt \
46
 
            /etc/keys/mandos/seckey.txt \
47
 
            /etc/keys/mandos/tls-privkey.pem \
48
 
            /etc/keys/mandos/tls-pubkey.pem \
49
 
            /etc/keys/mandos/dhparams.pem 2>/dev/null
 
48
            /etc/keys/mandos/seckey.txt 2>/dev/null
50
49
        update_initramfs
51
50
        ;;
52
51
    upgrade|failed-upgrade|disappear|abort-install|abort-upgrade)