/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-25 19:55:17 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100925195517-u0qfi01huxl72f75
* mandos (Client.runtime_expansions): New attribute containing the
                                      allowed runtime expansions.

* mandos-clients.conf.xml (OPTIONS): Reordered alphabetically.

* mandos-ctl: Bug fix: print timeout and interval values pretty again.

* mandos-ctl.xml (EXAMPLE): Added more examples.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
93
93
    def valuetostring(value, keyword):
94
94
        if type(value) is dbus.Boolean:
95
95
            return u"Yes" if value else u"No"
96
 
        if keyword in (u"timeout", u"interval"):
 
96
        if keyword in (u"Timeout", u"Interval"):
97
97
            return milliseconds_to_string(value)
98
98
        return unicode(value)
99
99
    
110
110
    for client in clients:
111
111
        print format_string % tuple(valuetostring(client[key], key)
112
112
                                    for key in keywords)
 
113
 
113
114
def has_actions(options):
114
115
    return any((options.enable,
115
116
                options.disable,