Make sure Solaris is happy too.

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index 8eb0be5..94f792c 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.41 2001/01/07 17:09:07 guus Exp $
+    $Id: tincd.c,v 1.10.4.46 2001/05/28 08:56:57 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;
 
@@ -229,6 +226,7 @@ int keygen(int bits)
 {
   RSA *rsa_key;
   FILE *f;
+  config_t const *cfg;
   char *filename;
 
   fprintf(stderr, _("Generating %d bits keys:\n"), bits);
@@ -242,16 +240,28 @@ int keygen(int bits)
   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);
@@ -323,7 +333,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,13 +348,16 @@ 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);
@@ -367,8 +384,7 @@ cp
       else
         {
           syslog(LOG_ERR, _("Not restarting."));
-          exit(0);
+          exit(1);
         }
     }
 }
-