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

  • Committer: Teddy Hogeborn
  • Date: 2009-02-09 05:48:04 UTC
  • mfrom: (24.1.134 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20090209054804-6phrjjrzjlpvuz7u
Merge from Björn:

* plugin-runner.c (main): Bug fix: For the "--options-for" option, do
                          not mangle arguments with colon characters.
                          Also support adding empty arguments.

* plugins.d/mandos-client.c: (mc): New global variable; moved from
                                   "main".
  (init_gpgme, pgp_packet_decrypt, init_gnutls_global,
  init_gnutls_session, start_mandos_communication): Removed "mc"
                                                    argument.  All
                                                    callers changed.

  (resolve_callback, browse_callback): Ignore "userdata" argument.
                                       All callers changed.
  (handle_sigterm): New function.
  (main): Add "handle_sigterm" as signal handler for SIGTERM before
          starting the main loop.

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
    if [ -x /usr/sbin/update-initramfs ]; then
22
22
        update-initramfs -u -k all
23
23
    fi
24
 
    
25
 
    if dpkg --compare-versions "$2" lt-nl "1.0.10-1"; then
26
 
        # Make old initrd.img files unreadable too, in case they were
27
 
        # created with mandos-client 1.0.8 or older.
28
 
        find /boot -maxdepth 1 -type f -name "initrd.img-*.bak" \
29
 
            -print0 | xargs --null --no-run-if-empty chmod o-r
30
 
    fi
31
24
}
32
25
 
33
26
# Add user and group
34
27
add_mandos_user(){
35
28
    # Rename old "mandos" user and group
36
 
    if dpkg --compare-versions "$2" lt "1.0.3-1"; then
37
 
        case "`getent passwd mandos`" in
38
 
            *:Mandos\ password\ system,,,:/nonexistent:/bin/false)
39
 
                usermod --login _mandos mandos
40
 
                groupmod --new-name _mandos mandos
41
 
                return
42
 
                ;;
43
 
        esac
44
 
    fi
 
29
    case "`getent passwd mandos`" in
 
30
        *:Mandos\ password\ system,,,:/nonexistent:/bin/false)
 
31
            usermod --login _mandos mandos
 
32
            groupmod --new-name _mandos mandos
 
33
            return
 
34
            ;;
 
35
    esac
45
36
    # Create new user and group
46
37
    if ! getent passwd _mandos >/dev/null; then
47
38
        adduser --system --force-badname --quiet --home /nonexistent \
63
54
 
64
55
case "$1" in
65
56
    configure)
66
 
        add_mandos_user "$@"
67
 
        create_key "$@"
68
 
        update_initramfs "$@"
 
57
        add_mandos_user
 
58
        create_key
 
59
        update_initramfs
69
60
        ;;
70
61
    abort-upgrade|abort-deconfigure|abort-remove)
71
62
        ;;