Save the environment on startup.

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index 41361d7..4c494f5 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -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.16 2000/10/28 21:05:20 guus Exp $
+    $Id: tincd.c,v 1.10.4.24 2000/11/03 22:31:55 zarq Exp $
 */
 
 #include "config.h"
@@ -33,6 +33,8 @@
 #include <signal.h>
 #include <openssl/rand.h>
 #include <openssl/rsa.h>
+#include <openssl/err.h>
+#include <string.h>
 
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
@@ -43,7 +45,6 @@
 #include <xalloc.h>
 
 #include "conf.h"
-#include "encr.h"
 #include "net.h"
 #include "netutl.h"
 #include "protocol.h"
@@ -73,6 +74,8 @@ char *identname;                 /* program name for syslog */
 char *pidfilename;               /* pid file location */
 static pid_t ppid;               /* pid of non-detached part */
 char **g_argv;                   /* a copy of the cmdline arguments */
+char **environment;              /* A pointer to the environment on
+                                    startup */
 
 void cleanup_and_exit(int);
 int detach(void);
@@ -89,7 +92,7 @@ static struct option const long_options[] =
   { "help", no_argument, &show_help, 1 },
   { "version", no_argument, &show_version, 1 },
   { "no-detach", no_argument, &do_detach, 0 },
-  { "keygen", optional_argument, NULL, 'K'},
+  { "generate-keys", optional_argument, NULL, 'K'},
   { NULL, 0, NULL, 0 }
 };
 
@@ -101,14 +104,14 @@ usage(int status)
   else
     {
       printf(_("Usage: %s [option]...\n\n"), program_name);
-      printf(_("  -c, --config=DIR      Read configuration options from DIR.\n"
-              "  -D, --no-detach       Don't fork and detach.\n"
-              "  -d                    Increase debug level.\n"
-              "  -k, --kill            Attempt to kill a running tincd and exit.\n"
-              "  -n, --net=NETNAME     Connect to net NETNAME.\n"));
-      printf(_("  -K, --keygen[=BITS]   Generate public/private RSA keypair.\n"
-               "      --help            Display this help and exit.\n"
-              "      --version         Output version information and exit.\n\n"));
+      printf(_("  -c, --config=DIR           Read configuration options from DIR.\n"
+              "  -D, --no-detach            Don't fork and detach.\n"
+              "  -d                         Increase debug level.\n"
+              "  -k, --kill                 Attempt to kill a running tincd and exit.\n"
+              "  -n, --net=NETNAME          Connect to net NETNAME.\n"));
+      printf(_("  -K, --generate-keys[=BITS] Generate public/private RSA keypair.\n"
+               "      --help                 Display this help and exit.\n"
+              "      --version              Output version information and exit.\n\n"));
       printf(_("Report bugs to tinc@nl.linux.org.\n"));
     }
   exit(status);
@@ -119,8 +122,7 @@ parse_options(int argc, char **argv, char **envp)
 {
   int r;
   int option_index = 0;
-  config_t *p;
-
+  
   while((r = getopt_long(argc, argv, "c:Ddkn:K::", long_options, &option_index)) != EOF)
     {
       switch(r)
@@ -205,9 +207,6 @@ int keygen(int bits)
 {
   RSA *rsa_key;
 
-  fprintf(stderr, _("Seeding the PRNG: please press some keys or move\nthe mouse if this program seems to have halted...\n"));
-  RAND_load_file("/dev/random", 1024); /* OpenSSL PRNG state apparently uses 1024 bytes, but it seems pretty sufficient anyway :) */
-
   fprintf(stderr, _("Generating %d bits keys:\n"), bits);
   rsa_key = RSA_generate_key(bits, 0xFFFF, indicator, NULL);
   if(!rsa_key)
@@ -252,7 +251,7 @@ int detach(void)
       if(pid) /* parent process */
        {
          signal(SIGTERM, parent_exit);
-//       sleep(600); /* wait 10 minutes */
+         sleep(600); /* wait 10 minutes */
          exit(1);
        }
     }
@@ -396,6 +395,7 @@ main(int argc, char **argv, char **envp)
   
   unknown = _("unknown");
 
+  environment = envp;
   parse_options(argc, argv, envp);
 
   if(show_version)
@@ -423,6 +423,10 @@ main(int argc, char **argv, char **envp)
 
   make_names();
 
+  /* Slllluuuuuuurrrrp! */
+
+  RAND_load_file("/dev/urandom", 1024);
+
   if(generate_keys)
     exit(keygen(generate_keys));
 
@@ -437,17 +441,16 @@ main(int argc, char **argv, char **envp)
   if(detach())
     exit(0);
 
-/* FIXME: wt* is this suppose to do?
-  if(security_init())
-    return 1;
-*/
+  if(debug_lvl >= DEBUG_ERROR)
+    ERR_load_crypto_strings();
+    
   for(;;)
     {
       if(!setup_network_connections())
         {
           main_loop();
           cleanup_and_exit(1);
-         }
+        }
       
       syslog(LOG_ERR, _("Unrecoverable error"));
       cp_trace();
@@ -459,7 +462,7 @@ main(int argc, char **argv, char **envp)
         }
       else
         {
-          syslog(LOG_ERR, _("Aieee! Not restarting."));
+          syslog(LOG_ERR, _("Not restarting."));
           exit(0);
         }
     }
@@ -470,6 +473,7 @@ sigterm_handler(int a)
 {
   if(debug_lvl > DEBUG_NOTHING)
     syslog(LOG_NOTICE, _("Got TERM signal"));
+
   cleanup_and_exit(0);
 }
 
@@ -505,7 +509,7 @@ sigsegv_handler(int a)
     }
   else
     {
-      syslog(LOG_NOTICE, _("Aieee! Not restarting."));
+      syslog(LOG_NOTICE, _("Not restarting."));
       exit(0);
     }
 }
@@ -514,7 +518,7 @@ RETSIGTYPE
 sighup_handler(int a)
 {
   if(debug_lvl > DEBUG_NOTHING)
-    syslog(LOG_NOTICE, _("Got HUP signal, rereading configuration and restarting"));
+    syslog(LOG_NOTICE, _("Got HUP signal"));
   sighup = 1;
 }
 
@@ -536,11 +540,6 @@ RETSIGTYPE
 sigusr2_handler(int a)
 {
   dump_subnet_list();
-//  if(debug_lvl > DEBUG_NOTHING)
-//   syslog(LOG_NOTICE, _("Got USR2 signal, forcing new key generation"));
-/* FIXME: reprogram this.
-  regenerate_keys();
-*/
 }
 
 RETSIGTYPE