- Let user choose whether keys are in the config files or separate

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index 77e52c0..535fdb3 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.37 2000/11/29 14:24:40 zarq Exp $
+    $Id: tincd.c,v 1.10.4.39 2001/01/05 23:53:53 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 */
@@ -279,6 +283,8 @@ void make_names(void)
 int
 main(int argc, char **argv, char **envp)
 {
+  openlog("tinc", LOG_PERROR, LOG_DAEMON);     /* Catch all syslog() calls issued before detaching */
+
   program_name = argv[0];
 
   setlocale (LC_ALL, "");
@@ -318,9 +324,9 @@ main(int argc, char **argv, char **envp)
   make_names();
 
   /* Slllluuuuuuurrrrp! */
-
+cp
   RAND_load_file("/dev/urandom", 1024);
-
+cp
   if(generate_keys)
     exit(keygen(generate_keys));
 
@@ -329,10 +335,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();