/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

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
700
700
    server_config = ConfigParser.SafeConfigParser(server_defaults)
701
701
    del server_defaults
702
702
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
703
 
    server_section = "server"
704
703
    # Convert the SafeConfigParser object to a dict
705
 
    server_settings = dict(server_config.items(server_section))
 
704
    server_settings = server_config.defaults()
706
705
    # Use getboolean on the boolean config option
707
706
    server_settings["debug"] = server_config.getboolean\
708
 
                               (server_section, "debug")
 
707
                               ("DEFAULT", "debug")
709
708
    del server_config
710
709
    
711
710
    # Override the settings from the config file with command line