/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: 2012-05-12 15:45:57 UTC
  • Revision ID: teddy@recompile.se-20120512154557-r1yzcb8su8byp4us
* mandos (Client.enable, Client.disable, ClientDBus.approve): Call
                    self.send_changedstate() after change, not before.
  (Client.disable): Bug fix: Handle disable_initiator_tag and
                    checker_initiator_tag of 0.
  (Client.init_checker): Bug fix: Remove old checker_initiator_tag and
                         disable_initiator_tag, if any.
  (Client.bump_timeout): Bug fix: Remove old disable_initiator_tag, if
                         any.
  (ClientDBus.Timeout_dbus_property): Bug fix: Use self.expires.
  (ClientHandler.handle): Bug fix: timedelta_to_milliseconds is a
                          global function, not a class method.
* mandos-monitor (MandosClientWidget._update_timer_callback_lock):
  Removed.  All users changed.
  (MandosClientWidget.last_checked_ok): Removed (unused).
  (MandosClientWidget.__init__): Don't call self.using_timer().
  (MandosClientWidget.property_changed): Removed unused version.
  (MandosClientWidget.using_timer): Stop using the counter
                                    self._update_timer_callback_lock;
                                    be strictly boolean.
  (MandosClientWidget.need_approval): Don't call self.using_timer().
  (MandosClientWidget.update): Call self.using_timer() throughout.
                               Bug fix: Never show negative timers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
6
6
# Default-Start:     2 3 4 5
7
7
# Default-Stop:      0 1 6
8
8
# Short-Description: Mandos server
9
 
# Description:       Server of encrypted passwords to Mandos clients
 
9
# Description:       Gives encrypted passwords to Mandos clients
10
10
### END INIT INFO
11
11
 
12
12
# Author: Teddy Hogeborn <teddy@recompile.se>
23
23
NAME=mandos
24
24
DAEMON=/usr/sbin/$NAME
25
25
DAEMON_ARGS=""
26
 
if [ -d /run/. ]; then
27
 
    PIDFILE=/run/$NAME.pid
28
 
else
29
 
    PIDFILE=/var/run/$NAME.pid
30
 
fi
 
26
PIDFILE=/var/run/$NAME.pid
31
27
SCRIPTNAME=/etc/init.d/$NAME
32
28
 
33
29
# Exit if the package is not installed
44
40
. /lib/init/vars.sh
45
41
 
46
42
# Define LSB log_* functions.
47
 
# Depend on lsb-base (>= 3.2-14) to ensure that this file is present.
 
43
# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
48
44
. /lib/lsb/init-functions
49
45
 
50
46
#
153
149
                ;;
154
150
        esac
155
151
        ;;
156
 
  status)
157
 
        status_of_proc "$DAEMON" "$NAME" -p "$PIDFILE"
158
 
        ;;
159
152
  *)
160
153
        #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
161
154
        echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2