X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=3dbac7e30f9f59d2626630d0f33cd1d6a68e9960;hp=7118d1f3fd4694323f203fb1bbfae5364fbce2e9;hb=bc22ee16e6903d2caf9d22afa85020d1e3e10b56;hpb=3a6200c1e39b61b249db3d1f9bcffa77351863bd

diff --git a/src/tincd.c b/src/tincd.c
index 7118d1f3..3dbac7e3 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.32 2000/11/20 22:13:14 guus Exp $
+    $Id: tincd.c,v 1.10.4.38 2000/12/03 12:23:06 zarq Exp $
 */
 
 #include "config.h"
@@ -56,6 +56,12 @@
 # include <err.h>
 #endif
 
+#ifdef HAVE_OPENSSL_PEM_H
+# include <openssl/pem.h>
+#else
+# include <pem.h>
+#endif
+
 
 
 #include <utils.h>
@@ -94,11 +100,6 @@ char **g_argv;                   /* a copy of the cmdline arguments */
 char **environment;              /* A pointer to the environment on
                                     startup */
 
-void cleanup_and_exit(int);
-int kill_other(void);
-void make_names(void);
-int write_pidfile(void);
-
 static struct option const long_options[] =
 {
   { "config", required_argument, NULL, 'c' },
@@ -152,7 +153,10 @@ parse_options(int argc, char **argv, char **envp)
 	  do_detach = 0;
 	  break;
 	case 'd': /* inc debug level */
-	  debug_lvl++;
+	  if(optarg)
+	    debug_lvl = atoi(optarg);
+	  else
+	    debug_lvl++;
 	  break;
 	case 'k': /* kill old tincds */
 	  kill_tincd = 1;
@@ -167,7 +171,8 @@ parse_options(int argc, char **argv, char **envp)
               generate_keys = atoi(optarg);
               if(generate_keys < 512)
                 {
-                  fprintf(stderr, _("Invalid argument! BITS must be a number equal to or greater than 512.\n"));
+                  fprintf(stderr, _("Invalid argument `%s'; BITS must be a number equal to or greater than 512.\n"),
+			  optarg);
                   usage(1);
                 }
               generate_keys &= ~7;	/* Round it to bytes */
@@ -216,11 +221,14 @@ void indicator(int a, int b, void *p)
   }
 }
 
-/* Generate a public/private RSA keypair, and possibly store it into the configuration file. */
-
+/*
+  Generate a public/private RSA keypair, and ask for a file to store
+  them in.
+*/
 int keygen(int bits)
 {
   RSA *rsa_key;
+  FILE *f;
 
   fprintf(stderr, _("Generating %d bits keys:\n"), bits);
   rsa_key = RSA_generate_key(bits, 0xFFFF, indicator, NULL);
@@ -232,11 +240,16 @@ int keygen(int bits)
   else
     fprintf(stderr, _("Done.\n"));
 
-  fprintf(stderr, _("Please copy the private key to tinc.conf and the\npublic key to your host configuration file:\n\n"));
-  printf("PublicKey = %s\n", BN_bn2hex(rsa_key->n));
-  printf("PrivateKey = %s\n", BN_bn2hex(rsa_key->d));
+  if((f = ask_and_safe_open("rsa_key.pub", _("public RSA key"))) == NULL)
+    return -1;
+  PEM_write_RSAPublicKey(f, rsa_key);
+  fclose(f);
   
-  fflush(stdin);
+  if((f = ask_and_safe_open("rsa_key.priv", _("private RSA key"))) == NULL)
+    return -1;
+  PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
+  fclose(f);
+
   return 0;
 }
 
@@ -248,7 +261,7 @@ void make_names(void)
   if(netname)
     {
       if(!pidfilename)
-        asprintf(&pidfilename, "/var/run/tinc.%s.pid", netname);
+        asprintf(&pidfilename, LOCALSTATEDIR "/run/tinc.%s.pid", netname);
       if(!confbase)
         asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname);
       else
@@ -259,7 +272,7 @@ void make_names(void)
   else
     {
       if(!pidfilename)
-        pidfilename = "/var/run/tinc.pid";
+        pidfilename = LOCALSTATEDIR "/run/tinc.pid";
       if(!confbase)
         asprintf(&confbase, "%s/tinc", CONFDIR);
       if(!identname)
@@ -321,8 +334,6 @@ main(int argc, char **argv, char **envp)
   if(read_server_config())
     return 1;
 
-  init_processes();
-
   if(detach())
     exit(0);