/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: 2009-01-23 20:09:55 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090123200955-h9oy2hwyv8uly1op
* mandos (main): Bug fix: use "getint" on the "port" config file
                 option.
* plugins.d/mandos-client.c (main): Fixed spelling of
                                    "gnutls_initalized" and
                                    "gpgme_initalized".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
941
941
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
942
942
    # Convert the SafeConfigParser object to a dict
943
943
    server_settings = server_config.defaults()
944
 
    # Use getboolean on the boolean config options
945
 
    server_settings["debug"] = (server_config.getboolean
946
 
                                ("DEFAULT", "debug"))
947
 
    server_settings["use_dbus"] = (server_config.getboolean
948
 
                                   ("DEFAULT", "use_dbus"))
 
944
    # Use the appropriate methods on the non-string config options
 
945
    server_settings["debug"] = server_config.getboolean("DEFAULT",
 
946
                                                        "debug")
 
947
    server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
 
948
                                                           "use_dbus")
 
949
    if server_settings["port"]:
 
950
        server_settings["port"] = server_config.getint("DEFAULT",
 
951
                                                       "port")
949
952
    del server_config
950
953
    
951
954
    # Override the settings from the config file with command line