/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-11-03 00:12:35 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091103001235-op9jfvtx6xvxch3h
* README (FAQ): Fix typo.
* mandos (main): Try to always do cleanup() before exit, since
                 otherwise the D-Bus bus name gets unregistered first.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
24
24
    'last_enabled': u'Last Enabled',
25
25
    'checker': u'Checker',
26
26
    }
27
 
defaultkeywords = ('name', 'enabled', 'timeout', 'last_checked_ok')
 
27
defaultkeywords = ('name', 'enabled', 'timeout', 'last_checked_ok',
 
28
                   'checker')
28
29
domain = 'se.bsnet.fukt'
29
30
busname = domain + '.Mandos'
30
31
server_path = '/'
127
128
                  help="Start checker for client")
128
129
parser.add_option("--stop-checker", action="store_true",
129
130
                  help="Stop checker for client")
130
 
parser.add_option("-V", "--is-enabled", action="store_true",
131
 
                  help="Check if client is enabled")
 
131
parser.add_option("-V", "--is-valid", action="store_true",
 
132
                  help="Check if client is still valid")
132
133
parser.add_option("-r", "--remove", action="store_true",
133
134
                  help="Remove client")
134
135
parser.add_option("-c", "--checker", type="string",
177
178
        client.StartChecker(dbus_interface=client_interface)
178
179
    if options.stop_checker:
179
180
        client.StopChecker(dbus_interface=client_interface)
180
 
    if options.is_enabled:
 
181
    if options.is_valid:
181
182
        sys.exit(0 if client.Get(client_interface,
182
183
                                 u"enabled",
183
184
                                 dbus_interface=dbus.PROPERTIES_IFACE)