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

* network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly.
* plugins.d/mandos-client.c (run_network_hooks): Raise priviliges in
                                                 child process.
  (main): Do not use getuid() to check if running setuid root.  Do not
          raise privileges for run_network_hooks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
60
60
server_path = "/"
61
61
server_interface = domain + ".Mandos"
62
62
client_interface = domain + ".Mandos.Client"
63
 
version = "1.4.0"
 
63
version = "1.4.1"
64
64
 
65
65
def timedelta_to_milliseconds(td):
66
66
    """Convert a datetime.timedelta object to milliseconds"""
301
301
                                         dbus_interface=
302
302
                                         dbus.PROPERTIES_IFACE)
303
303
                         else 1)
304
 
            if options.checker:
 
304
            if options.checker is not None:
305
305
                client.Set(client_interface, "Checker",
306
306
                           options.checker,
307
307
                           dbus_interface=dbus.PROPERTIES_IFACE)
308
 
            if options.host:
 
308
            if options.host is not None:
309
309
                client.Set(client_interface, "Host", options.host,
310
310
                           dbus_interface=dbus.PROPERTIES_IFACE)
311
 
            if options.interval:
 
311
            if options.interval is not None:
312
312
                client.Set(client_interface, "Interval",
313
313
                           timedelta_to_milliseconds
314
314
                           (string_to_delta(options.interval)),
315
315
                           dbus_interface=dbus.PROPERTIES_IFACE)
316
 
            if options.approval_delay:
 
316
            if options.approval_delay is not None:
317
317
                client.Set(client_interface, "ApprovalDelay",
318
318
                           timedelta_to_milliseconds
319
319
                           (string_to_delta(options.
320
320
                                            approval_delay)),
321
321
                           dbus_interface=dbus.PROPERTIES_IFACE)
322
 
            if options.approval_duration:
 
322
            if options.approval_duration is not None:
323
323
                client.Set(client_interface, "ApprovalDuration",
324
324
                           timedelta_to_milliseconds
325
325
                           (string_to_delta(options.
326
326
                                            approval_duration)),
327
327
                           dbus_interface=dbus.PROPERTIES_IFACE)
328
 
            if options.timeout:
 
328
            if options.timeout is not None:
329
329
                client.Set(client_interface, "Timeout",
330
330
                           timedelta_to_milliseconds
331
331
                           (string_to_delta(options.timeout)),
332
332
                           dbus_interface=dbus.PROPERTIES_IFACE)
333
 
            if options.extended_timeout:
 
333
            if options.extended_timeout is not None:
334
334
                client.Set(client_interface, "ExtendedTimeout",
335
335
                           timedelta_to_milliseconds
336
336
                           (string_to_delta(options.extended_timeout)),
337
337
                           dbus_interface=dbus.PROPERTIES_IFACE)
338
 
            if options.secret:
 
338
            if options.secret is not None:
339
339
                client.Set(client_interface, "Secret",
340
340
                           dbus.ByteArray(open(options.secret,
341
341
                                               "rb").read()),