* mandos-ctl (dbus): Rename imported module to "dbus_python". (main): Only create a bus object and do everything via that object. (get_mandos_dbus_object): Remove and move code into dbus or dbus_python_adapter namespaces. (if_dbus_exception_log_with_exception_and_exit): - '' - (SilenceLogger): - '' - (dbus): New; move everything dbus-specific into this module-like namespace. (dbus_python_adapter): New; move everything specific to the dbus-python D-Bus module into this module-like namespace. (command.Base.run): Take only a bus argument; use only that. Pass "client" argument as a D-Bus object path string, not a dbus-python proxy object. All derivatives adjusted. (command.IsEnabled.is_enabled): Remove. (command.Approve, command.Deny, command.Remove, command.PropertySetter): Do no logging of D-Bus commands, and use only bus, not client, to do D-Bus calls. (command.DumpJSON.dbus_boolean_to_bool): Remove; move filtering to dbus_python_adapter. (command.Enable, command.Disable, command.StopChecker, command.ApproveByDefault): Use normal Python booleans instead of dbus-python's special Boolean types. (Unique): New; move here out from inside TestPropertySetterCmd. (Test_get_mandos_dbus_object): Remove. (Test_get_managed_objects): - '' - (Test_dbus_exceptions): New. (Test_dbus_MandosBus): - '' - (Test_dbus_python_adapter_SystemBus): - '' - (Test_dbus_python_adapter_CachingBus): - '' - (Test_commands_from_options): Don't create mock client proxy objects, define dict of client properties and use a mock dbus to verify that the correct D-Bus calls are made. Also remove any types specific to dbus-python. (TestEnableCmd, TestDisableCmd, TestStartCheckerCmd, TestStopCheckerCmd, TestApproveByDefaultCmd, TestDenyByDefaultCmd): Use normal Python booleans instead of dbus-python's special Boolean types. (TestPropertySetterValueCmd.runTest): Remove; unnecessary.
|| 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