/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

  • Committer: teddy at recompile
  • Date: 2011-12-27 03:56:39 UTC
  • mto: This revision was merged to the branch mainline in revision 541.
  • Revision ID: teddy@recompile.se-20111227035639-hvvgrqchckawlg02
Add wireless network hook

* network-hooks.s/bridge: Use canonical syntax for "ip" command.
* network-hooks.s/wireless: New.
* network-hooks.s/wireless.conf: - '' -
* plugins.d/mandos-client.c (run_network_hooks): Add new "CONNECT"
                                                 environment variable.
* plugins.d/mandos-client.xml (NETWORK HOOKS/REQUIREMENTS): Document
                                                            "CONNECT"
                                                            environment
                                                            variable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
3
3
# 
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
# 
6
 
# Copyright © 2008-2012 Teddy Hogeborn
7
 
# Copyright © 2008-2012 Björn Påhlsson
 
6
# Copyright © 2008-2011 Teddy Hogeborn
 
7
# Copyright © 2008-2011 Björn Påhlsson
8
8
# 
9
9
# This program is free software: you can redistribute it and/or modify
10
10
# it under the terms of the GNU General Public License as published by
60
60
server_path = "/"
61
61
server_interface = domain + ".Mandos"
62
62
client_interface = domain + ".Mandos.Client"
63
 
version = "1.5.2"
 
63
version = "1.4.1"
64
64
 
65
65
def timedelta_to_milliseconds(td):
66
66
    """Convert a datetime.timedelta object to milliseconds"""
331
331
                           dbus_interface=dbus.PROPERTIES_IFACE)
332
332
            if options.secret is not None:
333
333
                client.Set(client_interface, "Secret",
334
 
                           dbus.ByteArray(options.secret.read()),
 
334
                           dbus.ByteArray(open(options.secret,
 
335
                                               "rb").read()),
335
336
                           dbus_interface=dbus.PROPERTIES_IFACE)
336
337
            if options.approved_by_default is not None:
337
338
                client.Set(client_interface, "ApprovedByDefault",