/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 Hogeborn
  • Date: 2010-09-11 18:34:55 UTC
  • mfrom: (24.1.162 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20100911183455-kmzttvbywdbfbepm
Merge from Björn.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
31
31
server_interface = domain + '.Mandos'
32
32
client_interface = domain + '.Mandos.Client'
33
33
version = "1.0.14"
34
 
bus = dbus.SystemBus()
35
 
mandos_dbus_objc = bus.get_object(busname, server_path)
 
34
try:
 
35
    bus = dbus.SystemBus()
 
36
    mandos_dbus_objc = bus.get_object(busname, server_path)
 
37
except dbus.exceptions.DBusException:
 
38
    sys.exit(1)
 
39
    
36
40
mandos_serv = dbus.Interface(mandos_dbus_objc,
37
41
                             dbus_interface = server_interface)
38
42
mandos_clients = mandos_serv.GetAllClientsWithProperties()
141
145
                  help="Set host for client")
142
146
parser.add_option("-s", "--secret", type="string",
143
147
                  help="Set password blob (file) for client")
 
148
parser.add_option("-A", "--approve", action="store_true",
 
149
                  help="Approve any current client request")
 
150
parser.add_option("-D", "--deny", action="store_true",
 
151
                  help="Deny any current client request")
144
152
options, client_names = parser.parse_args()
145
153
 
146
154
# Compile list of clients to process
202
210
        client.Set(client_interface, u"secret",
203
211
                   dbus.ByteArray(open(options.secret, u'rb').read()),
204
212
                   dbus_interface=dbus.PROPERTIES_IFACE)
 
213
    if options.approve:
 
214
        client.Approve(dbus.Boolean(True), dbus_interface=client_interface)
 
215
    if options.deny:
 
216
        client.Approve(dbus.Boolean(False), dbus_interface=client_interface)