Remove all unnecessary status.meta and status.active checks.

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index 3e02e69..75788d6 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -1,7 +1,7 @@
 /*
     tincd.c -- the main file for tincd
-    Copyright (C) 1998,1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>
-                            2000 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 1998-2001 Ivo Timmermans <itimmermans@bigfoot.com>
+                  2000,2001 Guus Sliepen <guus@sliepen.warande.net>
 
     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
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: tincd.c,v 1.10.4.40 2001/01/06 18:03:41 guus Exp $
+    $Id: tincd.c,v 1.10.4.50 2001/07/20 13:54:19 guus Exp $
 */
 
 #include "config.h"
@@ -38,31 +38,9 @@
 # include <sys/ioctl.h>
 #endif
 
-#ifdef HAVE_OPENSSL_RAND_H
-# include <openssl/rand.h>
-#else
-# include <rand.h>
-#endif
-
-#ifdef HAVE_OPENSSL_RSA_H
-# include <openssl/rsa.h>
-#else
-# include <rsa.h>
-#endif
-
-#ifdef HAVE_OPENSSL_ERR_H
-# include <openssl/err.h>
-#else
-# include <err.h>
-#endif
-
-#ifdef HAVE_OPENSSL_PEM_H
-# include <openssl/pem.h>
-#else
-# include <pem.h>
-#endif
-
-
+#include <openssl/rand.h>
+#include <openssl/rsa.h>
+#include <openssl/pem.h>
 
 #include <utils.h>
 #include <xalloc.h>
@@ -88,9 +66,6 @@ static int show_version;
 /* If nonzero, it will attempt to kill a running tincd and exit. */
 static int kill_tincd = 0;
 
-/* If zero, don't detach from the terminal. */
-extern int do_detach;
-
 /* If nonzero, generate public/private keypair for this host/net. */
 static int generate_keys = 0;
 
@@ -229,6 +204,7 @@ int keygen(int bits)
 {
   RSA *rsa_key;
   FILE *f;
+  config_t const *cfg;
   char *filename;
 
   fprintf(stderr, _("Generating %d bits keys:\n"), bits);
@@ -236,22 +212,34 @@ int keygen(int bits)
 
   if(!rsa_key)
     {
-      fprintf(stderr, _("Error during key generation!"));
+      fprintf(stderr, _("Error during key generation!\n"));
       return -1;
      }
   else
     fprintf(stderr, _("Done.\n"));
 
-  asprintf(&filename, "%s/rsa_key.pub", confbase);
-  if((f = ask_and_safe_open(filename, _("public RSA key"))) == NULL)
+  if(config && (cfg = get_config_val(config, config_name)))
+    asprintf(&filename, "%s/hosts/%s", confbase, cfg->data.ptr);
+  else
+    asprintf(&filename, "%s/rsa_key.priv", confbase);
+
+  if((f = ask_and_safe_open(filename, _("public RSA key"), "a")) == NULL)
     return -1;
+
+  if(ftell(f))
+    fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file.\n"));
+
   PEM_write_RSAPublicKey(f, rsa_key);
   fclose(f);
   free(filename);
   
   asprintf(&filename, "%s/rsa_key.priv", confbase);
-  if((f = ask_and_safe_open(filename, _("private RSA key"))) == NULL)
+  if((f = ask_and_safe_open(filename, _("private RSA key"), "a")) == NULL)
     return -1;
+
+  if(ftell(f))
+    fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file.\n"));
+
   PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
   fclose(f);
   free(filename);
@@ -295,17 +283,13 @@ main(int argc, char **argv, char **envp)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  /* Do some intl stuff right now */
-  
-  unknown = _("unknown");
-
   environment = envp;
   parse_options(argc, argv, envp);
 
   if(show_version)
     {
       printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE, VERSION, __DATE__, __TIME__, PROT_CURRENT);
-      printf(_("Copyright (C) 1998,1999,2000 Ivo Timmermans, Guus Sliepen and others.\n"
+      printf(_("Copyright (C) 1998-2001 Ivo Timmermans, Guus Sliepen and others.\n"
               "See the AUTHORS file for a complete list.\n\n"
               "tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
               "and you are welcome to redistribute it under certain conditions;\n"
@@ -323,7 +307,11 @@ main(int argc, char **argv, char **envp)
       return 1;
     }
 
-  openlog("tinc", LOG_PERROR, LOG_DAEMON);     /* Catch all syslog() calls issued before detaching */
+#ifdef HAVE_SOLARIS
+  openlog("tinc", LOG_CONS, LOG_DAEMON);        /* Catch all syslog() calls issued before detaching */
+#else  
+  openlog("tinc", LOG_PERROR, LOG_DAEMON);      /* Catch all syslog() calls issued before detaching */
+#endif
 
   g_argv = argv;
 
@@ -334,20 +322,20 @@ cp
   RAND_load_file("/dev/urandom", 1024);
 cp
   if(generate_keys)
-    exit(keygen(generate_keys));
-
+    {
+      read_server_config();
+      exit(keygen(generate_keys));
+    }
+    
   if(kill_tincd)
     exit(kill_other());
 
   if(read_server_config())
-    return 1;
+    exit(1);
 cp
   if(detach())
     exit(0);
 cp
-  if(debug_lvl >= DEBUG_ERROR)
-    ERR_load_crypto_strings();
-    
   for(;;)
     {
       if(!setup_network_connections())
@@ -367,8 +355,7 @@ cp
       else
         {
           syslog(LOG_ERR, _("Not restarting."));
-          exit(0);
+          exit(1);
         }
     }
 }
-