--- gvpe/src/conf.C	2003/10/14 15:48:15	1.17
+++ gvpe/src/conf.C	2004/01/29 19:30:08	1.23
@@ -1,10 +1,6 @@
 /*
     conf.c -- configuration code
-    Copyright (C) 1998 Robert van der Meulen
-                  1998-2002 Ivo Timmermans <ivo@o2w.nl>
-                  2000-2002 Guus Sliepen <guus@sliepen.eu.org>
-		  2000 Cris van Pelt <tribbel@arise.dhs.org>
-                  2003 Marc Lehmann <pcg@goof.com>
+    Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com>
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -39,6 +35,7 @@
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
 #include <openssl/rand.h>
+#include <openssl/bn.h>
 
 #include "gettext.h"
 
@@ -103,6 +100,7 @@
 {
   memset (this, 0, sizeof (*this));
 
+  mtu       = DEFAULT_MTU;
   rekey     = DEFAULT_REKEY;
   keepalive = DEFAULT_KEEPALIVE;
   llevel    = L_INFO;
@@ -230,11 +228,12 @@
             }
           else if (!strcmp (var, "ip-proto"))
             ip_proto = atoi (val);
-#if ENABLE_ICMP
-          //TODO: error message
           else if (!strcmp (var, "icmp-type"))
-            icmp_type = atoi (val);
+            {
+#if ENABLE_ICMP
+              icmp_type = atoi (val);
 #endif
+            }
 
           // per config
           else if (!strcmp (var, "node"))
@@ -262,10 +261,10 @@
                       {
                         ERR_load_RSA_strings (); ERR_load_PEM_strings ();
                         slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
-                        exit (1);
+                        exit (EXIT_FAILURE);
                       }
 
-                    RSA_blinding_on (node->rsa_key, 0);
+                    require (RSA_blinding_on (node->rsa_key, 0));
 
                     fclose (f);
                   }
@@ -274,13 +273,13 @@
                     slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
 
                     if (need_keys)
-                      exit (1);
+                      exit (EXIT_FAILURE);
                   }
 
                 free (fname);
               }
 
-              if (!::thisnode || !strcmp (node->nodename, ::thisnode))
+              if (::thisnode && !strcmp (node->nodename, ::thisnode))
                 thisnode = node;
             }
           else if (!strcmp (var, "private-key"))
@@ -303,14 +302,24 @@
             script_node_up = strdup (val);
           else if (!strcmp (var, "node-down"))
             script_node_down = strdup (val);
-#if ENABLE_HTTP_PROXY
           else if (!strcmp (var, "http-proxy-host"))
-            proxy_host = strdup (val);
+            {
+#if ENABLE_HTTP_PROXY
+              proxy_host = strdup (val);
+#endif
+            }
           else if (!strcmp (var, "http-proxy-port"))
-            proxy_port = atoi (val);
+            {
+#if ENABLE_HTTP_PROXY
+              proxy_port = atoi (val);
+#endif
+            }
           else if (!strcmp (var, "http-proxy-auth"))
-            proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
+            {
+#if ENABLE_HTTP_PROXY
+              proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
 #endif
+            }
 
           /* node-specific, non-defaultable */
           else if (node != &default_node && !strcmp (var, "hostname"))
@@ -383,7 +392,7 @@
   else
     {
       slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
-      exit (1);
+      exit (EXIT_FAILURE);
     }
 
   free (fname);
@@ -399,10 +408,10 @@
         {
           ERR_load_RSA_strings (); ERR_load_PEM_strings ();
           slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
-          exit (1);
+          exit (EXIT_FAILURE);
         }
 
-      RSA_blinding_on (rsa_key, 0);
+      require (RSA_blinding_on (rsa_key, 0));
 
       fclose (f);
     }
@@ -411,9 +420,18 @@
       slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
 
       if (need_keys)
-        exit (1);
+        exit (EXIT_FAILURE);
     }
 
+  if (need_keys && ::thisnode
+      && rsa_key && thisnode && thisnode->rsa_key)
+    if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
+        || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
+      {
+        slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
+        exit (EXIT_FAILURE);
+      }
+
   free (fname);
 }