/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

  • Committer: Björn Påhlsson
  • Date: 2011-09-18 16:04:23 UTC
  • mfrom: (497 trunk)
  • mto: This revision was merged to the branch mainline in revision 498.
  • Revision ID: belorn@fukt.bsnet.se-20110918160423-x09aoqldw7wqmzia
Merge from teddy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
299
299
                                      until this client is disabled
300
300
    extended_timeout:   extra long timeout when password has been sent
301
301
    runtime_expansions: Allowed attributes for runtime expansion.
302
 
    expire:     datetime.datetime(); time (UTC) when a client will be
 
302
    expires:    datetime.datetime(); time (UTC) when a client will be
303
303
                disabled, or None
304
304
    """
305
305