/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-11-29 20:30:21 UTC
  • mto: (518.1.13 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 524.
  • Revision ID: teddy@recompile.se-20111129203021-fzsq7sn15wysgqhd
* 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
1069
1069
        datetime_to_dbus, "LastApprovalRequest")
1070
1070
    approved_by_default = notifychangeproperty(dbus.Boolean,
1071
1071
                                               "ApprovedByDefault")
1072
 
    approval_delay = notifychangeproperty(dbus.UInt16,
 
1072
    approval_delay = notifychangeproperty(dbus.UInt64,
1073
1073
                                          "ApprovalDelay",
1074
1074
                                          type_func =
1075
1075
                                          timedelta_to_milliseconds)
1076
1076
    approval_duration = notifychangeproperty(
1077
 
        dbus.UInt16, "ApprovalDuration",
 
1077
        dbus.UInt64, "ApprovalDuration",
1078
1078
        type_func = timedelta_to_milliseconds)
1079
1079
    host = notifychangeproperty(dbus.String, "Host")
1080
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
 
1080
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1081
1081
                                   type_func =
1082
1082
                                   timedelta_to_milliseconds)
1083
1083
    extended_timeout = notifychangeproperty(
1084
 
        dbus.UInt16, "ExtendedTimeout",
 
1084
        dbus.UInt64, "ExtendedTimeout",
1085
1085
        type_func = timedelta_to_milliseconds)
1086
 
    interval = notifychangeproperty(dbus.UInt16,
 
1086
    interval = notifychangeproperty(dbus.UInt64,
1087
1087
                                    "Interval",
1088
1088
                                    type_func =
1089
1089
                                    timedelta_to_milliseconds)