/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos

* mandos (Client.current_checker_command): New attribute.
  (Client.start_checker): Make sure the running checker process is not
                          a zombie, just in case.

Show diffs side-by-side

added added

removed removed

Lines of Context:
66
66
import ctypes
67
67
import ctypes.util
68
68
 
69
 
version = "1.0.10"
 
69
version = "1.0.5"
70
70
 
71
71
logger = logging.Logger('mandos')
72
72
syslogger = (logging.handlers.SysLogHandler
753
753
 
754
754
class IPv6_TCPServer(SocketServer.ForkingMixIn,
755
755
                     SocketServer.TCPServer, object):
756
 
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
756
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port.
757
757
    Attributes:
758
758
        settings:       Server settings
759
759
        clients:        Set() of Client objects
949
949
                      " files")
950
950
    parser.add_option("--no-dbus", action="store_false",
951
951
                      dest="use_dbus",
952
 
                      help=optparse.SUPPRESS_HELP) # XXX: Not done yet
 
952
                      help="Do not provide D-Bus system bus"
 
953
                      " interface")
953
954
    parser.add_option("--no-ipv6", action="store_false",
954
955
                      dest="use_ipv6", help="Do not use IPv6")
955
956
    options = parser.parse_args()[0]
1003
1004
    # For convenience
1004
1005
    debug = server_settings["debug"]
1005
1006
    use_dbus = server_settings["use_dbus"]
1006
 
    use_dbus = False            # XXX: Not done yet
1007
1007
    use_ipv6 = server_settings["use_ipv6"]
1008
1008
    
1009
1009
    if not debug: