/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos-ctl

* mandos-clients.conf.xml (OPTIONS): Moved up "extended_timeout" to
                                     order options alphabetically.
* clients.conf: Language change in comment.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
52
52
    "ApprovalDelay": "Approval Delay",
53
53
    "ApprovalDuration": "Approval Duration",
54
54
    "Checker": "Checker",
 
55
    "ExtendedTimeout" : "Extended Timeout"
55
56
    }
56
57
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
57
58
domain = "se.bsnet.fukt"
59
60
server_path = "/"
60
61
server_interface = domain + ".Mandos"
61
62
client_interface = domain + ".Mandos.Client"
62
 
version = "1.3.0"
 
63
version = "1.3.1"
63
64
 
64
65
def timedelta_to_milliseconds(td):
65
66
    """Convert a datetime.timedelta object to milliseconds"""
149
150
                options.remove,
150
151
                options.checker is not None,
151
152
                options.timeout is not None,
 
153
                options.extended_timeout is not None,
152
154
                options.interval is not None,
153
155
                options.approved_by_default is not None,
154
156
                options.approval_delay is not None,
185
187
                        help="Set checker command for client")
186
188
    parser.add_argument("-t", "--timeout",
187
189
                        help="Set timeout for client")
 
190
    parser.add_argument("--extended-timeout",
 
191
                        help="Set extended timeout for client")
188
192
    parser.add_argument("-i", "--interval",
189
193
                        help="Set checker interval for client")
190
194
    parser.add_argument("--approve-by-default", action="store_true",
270
274
                        "LastEnabled", "ApprovalPending",
271
275
                        "ApprovedByDefault",
272
276
                        "LastApprovalRequest", "ApprovalDelay",
273
 
                        "ApprovalDuration", "Checker")
 
277
                        "ApprovalDuration", "Checker",
 
278
                        "ExtendedTimeout")
274
279
        else:
275
280
            keywords = defaultkeywords
276
281
        
325
330
                           timedelta_to_milliseconds
326
331
                           (string_to_delta(options.timeout)),
327
332
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
333
            if options.extended_timeout:
 
334
                client.Set(client_interface, "ExtendedTimeout",
 
335
                           timedelta_to_milliseconds
 
336
                           (string_to_delta(options.extended_timeout)),
 
337
                           dbus_interface=dbus.PROPERTIES_IFACE)
328
338
            if options.secret:
329
339
                client.Set(client_interface, "Secret",
330
340
                           dbus.ByteArray(open(options.secret,