X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=a99b81bc8de82b58013adbc2ad3cc737bacf3577;hp=ba17b30f59970cf32ada818205861cb23a1b2919;hb=b4c1d4e2d3287acd7ca438455c64e50a2828ad24;hpb=b7d4d4c17712e0bb9ee8bd497a2f525b79d5f40d

diff --git a/src/tincd.c b/src/tincd.c
index ba17b30f..a99b81bc 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.21 2000/10/29 22:55:15 guus Exp $
+    $Id: tincd.c,v 1.10.4.23 2000/10/30 10:19:06 guus Exp $
 */
 
 #include "config.h"
@@ -90,7 +90,7 @@ static struct option const long_options[] =
   { "help", no_argument, &show_help, 1 },
   { "version", no_argument, &show_version, 1 },
   { "no-detach", no_argument, &do_detach, 0 },
-  { "keygen", optional_argument, NULL, 'K'},
+  { "generate-keys", optional_argument, NULL, 'K'},
   { NULL, 0, NULL, 0 }
 };
 
@@ -102,14 +102,14 @@ usage(int status)
   else
     {
       printf(_("Usage: %s [option]...\n\n"), program_name);
-      printf(_("  -c, --config=DIR      Read configuration options from DIR.\n"
-	       "  -D, --no-detach       Don't fork and detach.\n"
-	       "  -d                    Increase debug level.\n"
-	       "  -k, --kill            Attempt to kill a running tincd and exit.\n"
-	       "  -n, --net=NETNAME     Connect to net NETNAME.\n"));
-      printf(_("  -K, --keygen[=BITS]   Generate public/private RSA keypair.\n"
-               "      --help            Display this help and exit.\n"
- 	       "      --version         Output version information and exit.\n\n"));
+      printf(_("  -c, --config=DIR           Read configuration options from DIR.\n"
+	       "  -D, --no-detach            Don't fork and detach.\n"
+	       "  -d                         Increase debug level.\n"
+	       "  -k, --kill                 Attempt to kill a running tincd and exit.\n"
+	       "  -n, --net=NETNAME          Connect to net NETNAME.\n"));
+      printf(_("  -K, --generate-keys[=BITS] Generate public/private RSA keypair.\n"
+               "      --help                 Display this help and exit.\n"
+ 	       "      --version              Output version information and exit.\n\n"));
       printf(_("Report bugs to tinc@nl.linux.org.\n"));
     }
   exit(status);
@@ -537,11 +537,6 @@ RETSIGTYPE
 sigusr2_handler(int a)
 {
   dump_subnet_list();
-/* FIXME: reprogram this.
-  if(debug_lvl > DEBUG_NOTHING)
-   syslog(LOG_NOTICE, _("Got USR2 signal, forcing new key generation"));
-  regenerate_keys();
-*/
 }
 
 RETSIGTYPE