/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 bsnet
  • Date: 2010-08-23 19:23:15 UTC
  • mto: (24.1.154 mandos)
  • mto: This revision was merged to the branch mainline in revision 421.
  • Revision ID: teddy@fukt.bsnet.se-20100823192315-pefgye0l6cavcejs
* debian/control (mandos/Depends): Added "python-urwid".
* mandos (Client.approved_by_default): Changed default to "True".
  (Client.approved_delay): Changed default to "0s".
  (ClientDBus.GotSecret, ClientDBus.Rejected,
  ClientDBus.NeedApproval): Emit "PropertyChanged" signal for the
                            "approved_pending" property.

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',
28
 
                   'checker')
 
27
defaultkeywords = ('name', 'enabled', 'timeout', 'last_checked_ok')
29
28
domain = 'se.bsnet.fukt'
30
29
busname = domain + '.Mandos'
31
30
server_path = '/'
32
31
server_interface = domain + '.Mandos'
33
32
client_interface = domain + '.Mandos.Client'
34
 
version = "1.0.12"
 
33
version = "1.0.14"
35
34
bus = dbus.SystemBus()
36
35
mandos_dbus_objc = bus.get_object(busname, server_path)
37
36
mandos_serv = dbus.Interface(mandos_dbus_objc,
128
127
                  help="Start checker for client")
129
128
parser.add_option("--stop-checker", action="store_true",
130
129
                  help="Stop checker for client")
131
 
parser.add_option("-V", "--is-valid", action="store_true",
132
 
                  help="Check if client is still valid")
 
130
parser.add_option("-V", "--is-enabled", action="store_true",
 
131
                  help="Check if client is enabled")
133
132
parser.add_option("-r", "--remove", action="store_true",
134
133
                  help="Remove client")
135
134
parser.add_option("-c", "--checker", type="string",
178
177
        client.StartChecker(dbus_interface=client_interface)
179
178
    if options.stop_checker:
180
179
        client.StopChecker(dbus_interface=client_interface)
181
 
    if options.is_valid:
 
180
    if options.is_enabled:
182
181
        sys.exit(0 if client.Get(client_interface,
183
182
                                 u"enabled",
184
183
                                 dbus_interface=dbus.PROPERTIES_IFACE)