X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=d0b00b0dda48ad7ac0aaa43f6b0bd9934ab69302;hp=f7b956fea124301851d63ab2b1b2565ec7e3557b;hb=5b0f5ad958d6db4e73aebc5ee6c608cdae81b7b5;hpb=178e52f76ef4ba40748c13ea7e518837394d6dbc

diff --git a/src/tincd.c b/src/tincd.c
index f7b956fe..d0b00b0d 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -114,6 +114,7 @@ static struct option const long_options[] = {
 	{"user", required_argument, NULL, 'U'},
 	{"logfile", optional_argument, NULL, 4},
 	{"pidfile", required_argument, NULL, 5},
+	{"option", required_argument, NULL, 'o'},
 	{NULL, 0, NULL, 0}
 };
 
@@ -129,20 +130,20 @@ static void usage(bool status) {
 				program_name);
 	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, --debug[=LEVEL]        Increase debug level or set it to LEVEL.\n"
-				"  -k, --kill[=SIGNAL]        Attempt to kill a running tincd and exit.\n"
-				"  -n, --net=NETNAME          Connect to net NETNAME.\n"
-				"  -K, --generate-keys[=BITS] Generate public/private RSA keypair.\n"
-				"  -L, --mlock                Lock tinc into main memory.\n"
-				"      --logfile[=FILENAME]   Write log entries to a logfile.\n"
-				"      --pidfile=FILENAME     Write PID to FILENAME.\n"
-				"  -o [HOST.]KEY=VALUE        Set global/host configuration value.\n"
-				"  -R, --chroot               chroot to NET dir at startup.\n"
-				"  -U, --user=USER            setuid to given USER at startup.\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, --debug[=LEVEL]            Increase debug level or set it to LEVEL.\n"
+				"  -k, --kill[=SIGNAL]            Attempt to kill a running tincd and exit.\n"
+				"  -n, --net=NETNAME              Connect to net NETNAME.\n"
+				"  -K, --generate-keys[=BITS]     Generate public/private RSA keypair.\n"
+				"  -L, --mlock                    Lock tinc into main memory.\n"
+				"      --logfile[=FILENAME]       Write log entries to a logfile.\n"
+				"      --pidfile=FILENAME         Write PID to FILENAME.\n"
+				"  -o, --option=[HOST.]KEY=VALUE  Set global/host configuration value.\n"
+				"  -R, --chroot                   chroot to NET dir at startup.\n"
+				"  -U, --user=USER                setuid to given USER at startup.\n"
+				"      --help                     Display this help and exit.\n"
+				"      --version                  Output version information and exit.\n\n");
 		printf("Report bugs to tinc@tinc-vpn.org.\n");
 	}
 }
@@ -361,9 +362,6 @@ static bool keygen(int bits) {
 	if(!f)
 		return false;
 
-	if(disable_old_keys(f))
-		fprintf(stderr, "Warning: old key(s) found and disabled.\n");
-  
 #ifdef HAVE_FCHMOD
 	/* Make it unreadable for others. */
 	fchmod(fileno(f), 0600);
@@ -384,9 +382,6 @@ static bool keygen(int bits) {
 	if(!f)
 		return false;
 
-	if(disable_old_keys(f))
-		fprintf(stderr, "Warning: old key(s) found and disabled.\n");
-
 	fputc('\n', f);
 	PEM_write_RSAPublicKey(f, rsa_key);
 	fclose(f);
@@ -586,6 +581,7 @@ int main2(int argc, char **argv) {
 	InitializeCriticalSection(&mutex);
 	EnterCriticalSection(&mutex);
 #endif
+        char *priority = NULL;
 
 	if(!detach())
 		return 1;
@@ -612,8 +608,6 @@ int main2(int argc, char **argv) {
 
 	/* Change process priority */
 
-        char *priority = NULL;
-
         if(get_config_string(lookup_config(config_tree, "ProcessPriority"), &priority)) {
                 if(!strcasecmp(priority, "Normal")) {
                         if (setpriority(NORMAL_PRIORITY_CLASS) != 0) {