/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: 2009-10-22 00:05:01 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091022000501-g792e99q5g1wkyet
Merge from release branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
31
31
server_path = '/'
32
32
server_interface = domain + '.Mandos'
33
33
client_interface = domain + '.Mandos.Client'
34
 
version = "1.0.14"
 
34
version = "1.0.13"
35
35
bus = dbus.SystemBus()
36
36
mandos_dbus_objc = bus.get_object(busname, server_path)
37
37
mandos_serv = dbus.Interface(mandos_dbus_objc,
128
128
                  help="Start checker for client")
129
129
parser.add_option("--stop-checker", action="store_true",
130
130
                  help="Stop checker for client")
131
 
parser.add_option("-V", "--is-enabled", action="store_true",
132
 
                  help="Check if client is enabled")
 
131
parser.add_option("-V", "--is-valid", action="store_true",
 
132
                  help="Check if client is still valid")
133
133
parser.add_option("-r", "--remove", action="store_true",
134
134
                  help="Remove client")
135
135
parser.add_option("-c", "--checker", type="string",
178
178
        client.StartChecker(dbus_interface=client_interface)
179
179
    if options.stop_checker:
180
180
        client.StopChecker(dbus_interface=client_interface)
181
 
    if options.is_enabled:
 
181
    if options.is_valid:
182
182
        sys.exit(0 if client.Get(client_interface,
183
183
                                 u"enabled",
184
184
                                 dbus_interface=dbus.PROPERTIES_IFACE)