=== modified file 'TODO'
--- TODO	2009-01-18 00:16:57 +0000
+++ TODO	2009-01-23 20:09:55 +0000
@@ -1,6 +1,7 @@
 -*- org -*-
 
 * mandos-client
+** TODO [#A] Clean up /tmp directory on signal
 ** TODO [#B] Temporarily lower kernel log level
    for less printouts during sucessfull boot.
    klogctl(6, NULL, 0); klogctl(7, NULL, 0);

=== modified file 'mandos'
--- mandos	2009-01-21 08:10:44 +0000
+++ mandos	2009-01-23 20:09:55 +0000
@@ -941,11 +941,14 @@
     server_config.read(os.path.join(options.configdir, "mandos.conf"))
     # Convert the SafeConfigParser object to a dict
     server_settings = server_config.defaults()
-    # Use getboolean on the boolean config options
-    server_settings["debug"] = (server_config.getboolean
-                                ("DEFAULT", "debug"))
-    server_settings["use_dbus"] = (server_config.getboolean
-                                   ("DEFAULT", "use_dbus"))
+    # Use the appropriate methods on the non-string config options
+    server_settings["debug"] = server_config.getboolean("DEFAULT",
+                                                        "debug")
+    server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
+                                                           "use_dbus")
+    if server_settings["port"]:
+        server_settings["port"] = server_config.getint("DEFAULT",
+                                                       "port")
     del server_config
     
     # Override the settings from the config file with command line

=== modified file 'plugins.d/mandos-client.c'
--- plugins.d/mandos-client.c	2009-01-14 14:20:17 +0000
+++ plugins.d/mandos-client.c	2009-01-23 20:09:55 +0000
@@ -838,8 +838,8 @@
     mandos_context mc = { .simple_poll = NULL, .server = NULL,
 			  .dh_bits = 1024, .priority = "SECURE256"
 			  ":!CTYPE-X.509:+CTYPE-OPENPGP" };
-    bool gnutls_initalized = false;
-    bool gpgme_initalized = false;
+    bool gnutls_initialized = false;
+    bool gpgme_initialized = false;
     
     {
       struct argp_option options[] = {
@@ -975,7 +975,7 @@
       exitcode = EXIT_FAILURE;
       goto end;
     } else {
-      gnutls_initalized = true;
+      gnutls_initialized = true;
     }
     
     if(mkdtemp(tempdir) == NULL){
@@ -985,11 +985,11 @@
     }
     
     if(not init_gpgme(&mc, pubkey, seckey, tempdir)){
-      fprintf(stderr, "gpgme_initalized failed\n");
+      fprintf(stderr, "init_gpgme failed\n");
       exitcode = EXIT_FAILURE;
       goto end;
     } else {
-      gpgme_initalized = true;
+      gpgme_initialized = true;
     }
     
     if_index = (AvahiIfIndex) if_nametoindex(interface);
@@ -1105,13 +1105,13 @@
     if(mc.simple_poll != NULL)
         avahi_simple_poll_free(mc.simple_poll);
     
-    if(gnutls_initalized){
+    if(gnutls_initialized){
       gnutls_certificate_free_credentials(mc.cred);
       gnutls_global_deinit();
       gnutls_dh_params_deinit(mc.dh_params);
     }
     
-    if(gpgme_initalized){
+    if(gpgme_initialized){
       gpgme_release(mc.ctx);
     }