/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 init.d-mandos

  • 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:
init.d-mandos
1
1
#! /bin/sh
2
2
### BEGIN INIT INFO
3
3
# Provides:          mandos
4
 
# Required-Start:    $remote_fs avahi-daemon
5
 
# Required-Stop:     $remote_fs
 
4
# Required-Start:    $remote_fs $syslog avahi-daemon
 
5
# Required-Stop:     $remote_fs $syslog avahi-daemon
6
6
# Default-Start:     2 3 4 5
7
7
# Default-Stop:      0 1 6
8
8
# Short-Description: Mandos server
9
 
# Description:       Gives encrypted passwords to Mandos clients
 
9
# Description:       Server of encrypted passwords to Mandos clients
10
10
### END INIT INFO
11
11
 
12
 
# Author: Teddy Hogeborn <teddy@fukt.bsnet.se>
13
 
# Author: Björn Påhlsson <belorn@fukt.bsnet.se>
 
12
# Author: Teddy Hogeborn <teddy@recompile.se>
 
13
# Author: Björn Påhlsson <belorn@recompile.se>
14
14
#
15
15
# Please remove the "Author" lines above and replace them
16
16
# with your own name if you copy and modify this script.
23
23
NAME=mandos
24
24
DAEMON=/usr/sbin/$NAME
25
25
DAEMON_ARGS=""
26
 
PIDFILE=/var/run/$NAME.pid
 
26
if [ -d /run/. ]; then
 
27
    PIDFILE=/run/$NAME.pid
 
28
else
 
29
    PIDFILE=/var/run/$NAME.pid
 
30
fi
27
31
SCRIPTNAME=/etc/init.d/$NAME
28
32
 
29
33
# Exit if the package is not installed
40
44
. /lib/init/vars.sh
41
45
 
42
46
# Define LSB log_* functions.
43
 
# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
 
47
# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
 
48
# and status_of_proc is working.
44
49
. /lib/lsb/init-functions
45
50
 
46
51
#
118
123
                2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
119
124
        esac
120
125
        ;;
 
126
  status)
 
127
        status_of_proc "$DAEMON" "$NAME" -p "$PIDFILE" && exit 0 || exit $?
 
128
        ;;
121
129
  #reload|force-reload)
122
130
        #
123
131
        # If do_reload() is not implemented then leave this commented out
144
152
                esac
145
153
                ;;
146
154
          *)
147
 
                # Failed to stop
 
155
                # Failed to stop
148
156
                log_end_msg 1
149
157
                ;;
150
158
        esac
151
159
        ;;
152
160
  *)
153
161
        #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
154
 
        echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
 
162
        echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
155
163
        exit 3
156
164
        ;;
157
165
esac