X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=3e02e69950c2904e60ed79c7d466573afd124b38;hp=7a65aadae51658f88595ea5f982055ccd61739d9;hb=f7bb205022e02c02c02733cd43544c231373115d;hpb=3ff76eb10acc55b6f269c1075de6bbaa5bc83516

diff --git a/src/tincd.c b/src/tincd.c
index 7a65aada..3e02e699 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.36 2000/11/28 23:12:57 zarq Exp $
+    $Id: tincd.c,v 1.10.4.40 2001/01/06 18:03:41 guus Exp $
 */
 
 #include "config.h"
@@ -153,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;
@@ -168,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 */
@@ -225,9 +229,11 @@ int keygen(int bits)
 {
   RSA *rsa_key;
   FILE *f;
+  char *filename;
 
   fprintf(stderr, _("Generating %d bits keys:\n"), bits);
   rsa_key = RSA_generate_key(bits, 0xFFFF, indicator, NULL);
+
   if(!rsa_key)
     {
       fprintf(stderr, _("Error during key generation!"));
@@ -236,15 +242,19 @@ int keygen(int bits)
   else
     fprintf(stderr, _("Done.\n"));
 
-  if((f = ask_and_safe_open("rsa_key.pub")) == NULL)
+  asprintf(&filename, "%s/rsa_key.pub", confbase);
+  if((f = ask_and_safe_open(filename, _("public RSA key"))) == NULL)
     return -1;
   PEM_write_RSAPublicKey(f, rsa_key);
   fclose(f);
+  free(filename);
   
-  if((f = ask_and_safe_open("rsa_key.priv")) == NULL)
+  asprintf(&filename, "%s/rsa_key.priv", confbase);
+  if((f = ask_and_safe_open(filename, _("private RSA key"))) == NULL)
     return -1;
   PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
   fclose(f);
+  free(filename);
 
   return 0;
 }
@@ -261,7 +271,7 @@ void make_names(void)
       if(!confbase)
         asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname);
       else
-        fprintf(stderr, _("Both netname and configuration directory given, using the latter...\n"));
+        syslog(LOG_INFO, _("Both netname and configuration directory given, using the latter..."));
       if(!identname)
         asprintf(&identname, "tinc.%s", netname);
     }
@@ -309,18 +319,20 @@ main(int argc, char **argv, char **envp)
 
   if(geteuid())
     {
-      fprintf(stderr, _("You must be root to run this program. Sorry.\n"));
+      fprintf(stderr, _("You must be root to run this program.\n"));
       return 1;
     }
 
+  openlog("tinc", LOG_PERROR, LOG_DAEMON);	/* Catch all syslog() calls issued before detaching */
+
   g_argv = argv;
 
   make_names();
 
   /* Slllluuuuuuurrrrp! */
-
+cp
   RAND_load_file("/dev/urandom", 1024);
-
+cp
   if(generate_keys)
     exit(keygen(generate_keys));
 
@@ -329,10 +341,10 @@ main(int argc, char **argv, char **envp)
 
   if(read_server_config())
     return 1;
-
+cp
   if(detach())
     exit(0);
-
+cp
   if(debug_lvl >= DEBUG_ERROR)
     ERR_load_crypto_strings();