/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

Merge from trunk; Better parsing of numbers in command line options,
new "mandos=off" kernel parameter, plus other smaller fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
911
911
                      " files")
912
912
    parser.add_option("--no-dbus", action="store_false",
913
913
                      dest="use_dbus",
914
 
                      help=optparse.SUPPRESS_HELP)
 
914
                      help=optparse.SUPPRESS_HELP) # XXX: Not done yet
915
915
    options = parser.parse_args()[0]
916
916
    
917
917
    if options.check:
957
957
    # For convenience
958
958
    debug = server_settings["debug"]
959
959
    use_dbus = server_settings["use_dbus"]
960
 
    use_dbus = False
 
960
    use_dbus = False            # XXX: Not done yet
961
961
    
962
962
    if not debug:
963
963
        syslogger.setLevel(logging.WARNING)