Don't load table of verbose OpenSSL errormessages.

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index b1f0eb5..f9cd82f 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.42 2001/01/13 16:36:23 guus Exp $
+    $Id: tincd.c,v 1.10.4.49 2001/07/04 08:43:32 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;
 
@@ -246,13 +221,13 @@ int keygen(int bits)
   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");
+    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."));
+    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);
@@ -263,7 +238,7 @@ int keygen(int bits)
     return -1;
 
   if(ftell(f))
-    fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file."));
+    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);
@@ -308,10 +283,6 @@ 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);
 
@@ -336,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;
 
@@ -356,14 +331,11 @@ cp
     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())
@@ -383,8 +355,7 @@ cp
       else
         {
           syslog(LOG_ERR, _("Not restarting."));
-          exit(0);
+          exit(1);
         }
     }
 }
-