/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 mandos

  • Committer: Teddy Hogeborn
  • Date: 2011-12-03 01:04:54 UTC
  • Revision ID: teddy@recompile.se-20111203010454-9g5cyo2x7xwnacc5
* mandos (ClientDBus.approval_delay, ClientDBus.approval_duration,
  ClientDBus.timeout, ClientDBus.extended_timeout,
  ClientDBus.interval): Bug fix: Cast to correct D-Bus type.
* mandos-ctl (string_to_delta): Interpret unadorned numbers as
                                milliseconds.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
1012
1012
        datetime_to_dbus, "LastApprovalRequest")
1013
1013
    approved_by_default = notifychangeproperty(dbus.Boolean,
1014
1014
                                               "ApprovedByDefault")
1015
 
    approval_delay = notifychangeproperty(dbus.UInt16,
 
1015
    approval_delay = notifychangeproperty(dbus.UInt64,
1016
1016
                                          "ApprovalDelay",
1017
1017
                                          type_func =
1018
1018
                                          _timedelta_to_milliseconds)
1019
1019
    approval_duration = notifychangeproperty(
1020
 
        dbus.UInt16, "ApprovalDuration",
 
1020
        dbus.UInt64, "ApprovalDuration",
1021
1021
        type_func = _timedelta_to_milliseconds)
1022
1022
    host = notifychangeproperty(dbus.String, "Host")
1023
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
 
1023
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1024
1024
                                   type_func =
1025
1025
                                   _timedelta_to_milliseconds)
1026
1026
    extended_timeout = notifychangeproperty(
1027
 
        dbus.UInt16, "ExtendedTimeout",
 
1027
        dbus.UInt64, "ExtendedTimeout",
1028
1028
        type_func = _timedelta_to_milliseconds)
1029
 
    interval = notifychangeproperty(dbus.UInt16,
 
1029
    interval = notifychangeproperty(dbus.UInt64,
1030
1030
                                    "Interval",
1031
1031
                                    type_func =
1032
1032
                                    _timedelta_to_milliseconds)