X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=04ff4d0bb3042147e6007d38ff0b4d53b8412877;hp=318f7594e630f2bf288e9f744c44d23a9f4f1caa;hb=43923d2b106bfbe9300cc8e364cf098444cd649e;hpb=125c4978812cffa5154ce5378a276f43f78417d8

diff --git a/src/tincd.c b/src/tincd.c
index 318f7594..04ff4d0b 100644
--- 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.45 2001/03/01 21:32:04 guus Exp $
+    $Id: tincd.c,v 1.10.4.51 2001/07/24 20:04:22 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>
@@ -234,7 +212,7 @@ int keygen(int bits)
 
   if(!rsa_key)
     {
-      fprintf(stderr, _("Error during key generation!"));
+      fprintf(stderr, _("Error during key generation!\n"));
       return -1;
      }
   else
@@ -243,7 +221,7 @@ 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", confbase);
+    asprintf(&filename, "%s/rsa_key.pub", confbase);
 
   if((f = ask_and_safe_open(filename, _("public RSA key"), "a")) == NULL)
     return -1;
@@ -305,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);
 
@@ -333,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;
 
@@ -358,9 +336,6 @@ cp
   if(detach())
     exit(0);
 cp
-  if(debug_lvl >= DEBUG_ERROR)
-    ERR_load_crypto_strings();
-    
   for(;;)
     {
       if(!setup_network_connections())