/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: Teddy Hogeborn
  • Date: 2012-05-12 19:29:05 UTC
  • Revision ID: teddy@recompile.se-20120512192905-8icx7a55j0o7o70n
* mandos (Client.runtime_expansions): Add "expires" and (bug fix)
                                      "last_approval_request".
  (main): Don't ignore SIGINT.
* mandos-clients.conf.xml (RUNTIME EXPANSION): Added "expires".

Show diffs side-by-side

added added

removed removed

Lines of Context:
442
442
    """
443
443
    
444
444
    runtime_expansions = ("approval_delay", "approval_duration",
445
 
                          "created", "enabled", "fingerprint",
446
 
                          "host", "interval", "last_checked_ok",
 
445
                          "created", "enabled", "expires",
 
446
                          "fingerprint", "host", "interval",
 
447
                          "last_approval_request", "last_checked_ok",
447
448
                          "last_enabled", "name", "timeout")
448
449
    client_defaults = { "timeout": "5m",
449
450
                        "extended_timeout": "15m",
2461
2462
            # "pidfile" was never created
2462
2463
            pass
2463
2464
        del pidfilename
2464
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2465
2465
    
2466
2466
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2467
2467
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())