/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

  • Committer: Teddy Hogeborn
  • Date: 2008-08-18 05:57:11 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080818055711-2rpzat3hkbq3us62
No code or documentation changes.

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"
703
704
    # Convert the SafeConfigParser object to a dict
704
 
    server_settings = server_config.defaults()
 
705
    server_settings = dict(server_config.items(server_section))
705
706
    # Use getboolean on the boolean config option
706
707
    server_settings["debug"] = server_config.getboolean\
707
 
                               ("DEFAULT", "debug")
 
708
                               (server_section, "debug")
708
709
    del server_config
709
710
    
710
711
    # Override the settings from the config file with command line