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

  • Committer: Teddy Hogeborn
  • Date: 2015-08-10 09:00:23 UTC
  • Revision ID: teddy@recompile.se-20150810090023-fz6vjqr7zf33e2tf
Support the standard org.freedesktop.DBus.ObjectManager interface.

Now that the D-Bus standard has an interface to keep track of new and
removed objects, use that instead of our own methods.  This deprecates
our D-Bus methods "GetAllClients" and "GetAllClientsWithProperties"
and the signals "ClientAdded" and "ClientRemoved", all on the server
interface "se.recompile.Mandos".

* DBUS-API: Removed references to deprecated methods and signals;
  insert reference to the org.freedesktop.DBus.ObjectManager
  interface.
* mandos (DBusObjectWithProperties._get_all_interface_names): New.
  (dbus.OBJECT_MANAGER_IFACE): If not present, monkey patch.
  (DBusObjectWithObjectManager): New.
  (main/MandosDBusService): Inherit from DBusObjectWithObjectManager.
  (main/MandosDBusService.ClientRemoved): Annotate as deprecated.
  (main/MandosDBusService.GetAllClients): - '' -
  (main/MandosDBusService.GetAllClientsWithProperties): Annotate as
                                                        deprecated.
                                                        Also only
                                                        return
                                                        properties on
                                                        client
                                                        interface.
  (main/MandosDBusService.RemoveClient): Call client_removed_signal
                                         instead of ClientRemoved.
  (main/MandosDBusService.GetManagedObjects): New.
  (main/MandosDBusService.client_added_signal): New.
  (main/MandosDBusService.client_removed_signal): - '' -
  (main/cleanup): Call "client_removed_signal" instead of sending
                  "ClientRemoved" signal directly.
  (main): Call "client_added_signal" instead of sending "ClientAdded"
          signal directly.
* mandos-ctl: Use GetManagedObjects instead of
              GetAllClientsWithProperties.  Also, show better error
              message in case of failure to connect to the D-Bus

* mandos-monitor (MandosClientPropertyCache.properties_changed):
  Bug fix; only update properties on client interface.
  (UserInterface.find_and_remove_client): Change to accept arguments
                                          from InterfacesRemoved
                                          signal.  Also, bug fix:
                                          working error message when
                                          removing unknown client.
  (UserInterface.add_new_client): Change to accept arguments from
                                  InterfacesRemoved signal.  Pass
                                  properties to MandosClientWidget
                                  constructor.
  (UserInterface.run): Connect find_and_remove_client method to
                       InterfacesRemoved signal and the add_new_client
                       method to the InterfacesAdded signal.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#! /bin/sh
 
1
#!/bin/sh
2
2
# prerm script for mandos
3
3
#
4
4
# see: dh_installdeb(1)
6
6
set -e
7
7
 
8
8
# summary of how this script can be called:
9
 
#        * <prerm> `remove'
10
 
#        * <old-prerm> `upgrade' <new-version>
11
 
#        * <new-prerm> `failed-upgrade' <old-version>
12
 
#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
13
 
#        * <deconfigured's-prerm> `deconfigure' `in-favour'
14
 
#          <package-being-installed> <version> `removing'
 
9
#        * <prerm> 'remove'
 
10
#        * <old-prerm> 'upgrade' <new-version>
 
11
#        * <new-prerm> 'failed-upgrade' <old-version>
 
12
#        * <conflictor's-prerm> 'remove' 'in-favour' <package> <new-version>
 
13
#        * <deconfigured's-prerm> 'deconfigure' 'in-favour'
 
14
#          <package-being-installed> <version> 'removing'
15
15
#          <conflicting-package> <version>
16
16
# for details, see /usr/share/doc/packaging-manual/
17
17
 
18
18
case "$1" in
19
19
    remove|deconfigure)
20
 
        if [ -x /etc/init.d/mandos ]; then
21
 
                if [ -x /usr/sbin/invoke-rc.d ]; then
22
 
                        invoke-rc.d mandos stop
23
 
                else
24
 
                        /etc/init.d/mandos stop
25
 
                fi
26
 
        fi
 
20
        invoke-rc.d mandos stop || :
27
21
        ;;
28
22
    upgrade|failed-upgrade)
29
23
        ;;
30
24
    *)
31
 
        echo "prerm called with unknown argument \`$1'" >&2
 
25
        echo "prerm called with unknown argument '$1'" >&2
32
26
        exit 0
33
27
    ;;
34
28
esac