X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincd.c;h=3e3b7b0dfd9586b435912958d2c275c2f9a70fca;hb=911c05f873ad967c40d04aa7347b1067fe62c055;hp=d5942ce0c2f396ba7c5b20566d31452487390090;hpb=1b8f8918360b40a2749d40355266ed7dedbe41b5;p=tinc

diff --git a/src/tincd.c b/src/tincd.c
index d5942ce0..3e3b7b0d 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -97,13 +97,14 @@ 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"
+		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"
 				"  -n, --net=NETNAME             Connect to net NETNAME.\n"
 				"  -L, --mlock                   Lock tinc into main memory.\n"
 				"      --logfile[=FILENAME]      Write log entries to a logfile.\n"
 				"      --controlsocket=FILENAME  Open control socket at FILENAME.\n"
+				"      --bypass-security         Disables meta protocol security, for debugging.\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"));
@@ -185,7 +186,7 @@ static void make_names(void)
 #ifdef HAVE_MINGW
 	HKEY key;
 	char installdir[1024] = "";
-	long len = sizeof(installdir);
+	long len = sizeof installdir;
 #endif
 
 	if(netname)
@@ -212,7 +213,7 @@ static void make_names(void)
 #endif
 
 	if(!controlsocketname)
-		asprintf(&controlsocketname, LOCALSTATEDIR "/run/%s.control", identname);
+		asprintf(&controlsocketname, "%s/run/%s.control/socket", LOCALSTATEDIR, identname);
 
 	if(!logfilename)
 		asprintf(&logfilename, LOCALSTATEDIR "/log/%s.log", identname);