X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=d9512240d23d5a0475265e68d31c99660565c58c;hp=b1f0eb59ac410a2b530e39559c95646cdfcdbfa0;hb=4f9dad0972ac0f665a1b6050b059bd52f93e6221;hpb=a56df1e06be3f47a775919e564c147687e961b5d

diff --git a/src/tincd.c b/src/tincd.c
index b1f0eb59..d9512240 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.42 2001/01/13 16:36:23 guus Exp $
+    $Id: tincd.c,v 1.10.4.47 2001/06/05 16:09:55 guus Exp $
 */
 
 #include "config.h"
@@ -88,9 +88,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 +243,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 +260,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 +305,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 +329,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,7 +353,7 @@ cp
     exit(kill_other());
 
   if(read_server_config())
-    return 1;
+    exit(1);
 cp
   if(detach())
     exit(0);
@@ -383,8 +380,7 @@ cp
       else
         {
           syslog(LOG_ERR, _("Not restarting."));
-          exit(0);
+          exit(1);
         }
     }
 }
-