/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: 2018-04-01 19:27:30 UTC
  • Revision ID: teddy@recompile.se-20180401192730-jwr4io5cb3x5u268
Don't print NULL string pointers in error message output

* plugins.d/mandos-client.c (pgp_packet_decrypt): If decryption fails,
  don't print unsupported_algorithm if it is NULL.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/mandos-client.postrm
1
 
#!/bin/sh -e
 
1
#!/bin/sh
2
2
# This script can be called in the following ways:
3
3
#
4
4
# After the package was removed:
26
26
# If preinst fails during upgrade:
27
27
#       <new-postrm> abort-upgrade <old-version>
28
28
 
 
29
set -e
29
30
 
30
31
# Update the initial RAM file system image
31
32
update_initramfs()
32
33
{
33
 
    if [ -x /usr/sbin/update-initramfs ]; then
34
 
        update-initramfs -u -k all
35
 
    fi
 
34
    update-initramfs -u -k all || :
36
35
}
37
36
 
38
37
case "$1" in
44
43
        shred --remove /etc/keys/mandos/seckey.txt 2>/dev/null || :
45
44
        rm --force /etc/mandos/plugin-runner.conf \
46
45
            /etc/keys/mandos/pubkey.txt \
47
 
            /etc/keys/mandos/seckey.txt 2>/dev/null
 
46
            /etc/keys/mandos/seckey.txt \
 
47
            /etc/keys/mandos/dhparams.pem 2>/dev/null
 
48
        update_initramfs
48
49
        ;;
49
50
    upgrade|failed-upgrade|disappear|abort-install|abort-upgrade)
50
51
        ;;
51
52
 
52
53
    *)
53
 
        echo "$0 called with unknown argument \`$1'" 1>&2
 
54
        echo "$0 called with unknown argument '$1'" 1>&2
54
55
        exit 1
55
56
        ;;
56
57
esac