/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: 2019-03-31 04:39:25 UTC
  • mto: This revision was merged to the branch mainline in revision 382.
  • Revision ID: teddy@recompile.se-20190331043925-0j9pdspo3hux5nka
mandos-ctl: Refactor: Move command list generation into argparse

* mandos-ctl (add_command_line_options): Don't simply set flags for
                                         each option; instead, add
                                         command objects to a
                                         "commands" list.
  (check_option_syntax): Rework to deal with an already-generated
                         command list.
  (commands_from_options): Remove all code to generate command list,
                           but add more code to move command.Deny
                           ahead of command.Remove in command list.
  (command.PropertySetterValue.argparse): New; used in
                                          add_command_line_options.
  (Test_check_option_syntax): Refactor to pass actual string arguments
                              to parse_args() instead of modifying an
                              argparse.Namespace.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/mandos.postinst
56
56
            chmod u=rwx,go= /var/lib/mandos
57
57
        fi
58
58
 
 
59
        if dpkg --compare-versions "$2" eq "1.8.0-1" \
 
60
                || dpkg --compare-versions "$2" eq "1.8.0-1~bpo9+1"; then
 
61
            if grep --quiet --regexp='^[[:space:]]*key_id[[:space:]]*=[[:space:]]*[Ee]3[Bb]0[Cc]44298[Ff][Cc]1[Cc]149[Aa][Ff][Bb][Ff]4[Cc]8996[Ff][Bb]92427[Aa][Ee]41[Ee]4649[Bb]934[Cc][Aa]495991[Bb]7852[Bb]855[[:space:]]*$' /etc/mandos/clients.conf; then
 
62
                sed --in-place \
 
63
                    --expression='/^[[:space:]]*key_id[[:space:]]*=[[:space:]]*[Ee]3[Bb]0[Cc]44298[Ff][Cc]1[Cc]149[Aa][Ff][Bb][Ff]4[Cc]8996[Ff][Bb]92427[Aa][Ee]41[Ee]4649[Bb]934[Cc][Aa]495991[Bb]7852[Bb]855[[:space:]]*$/d' \
 
64
                    /etc/mandos/clients.conf
 
65
                invoke-rc.d mandos restart
 
66
                db_version 2.0
 
67
                db_fset mandos/removed_bad_key_ids seen false
 
68
                db_reset mandos/removed_bad_key_ids
 
69
                db_input critical mandos/removed_bad_key_ids || true
 
70
                db_go
 
71
                db_stop
 
72
            fi
 
73
        fi
 
74
 
59
75
        gnutls_version=$(dpkg-query --showformat='${Version}' \
60
76
                                    --show libgnutls30 \
61
77
                                    2>/dev/null || :)