X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnames.c;h=c42b95348944c35caf87b261e0216e25ca2ff265;hb=42b222ecb66b1957d7b439e5d8be8b287aef0054;hp=5a5270a9d7761d16aedd73219f1cd073c8253c13;hpb=f5bb64b36ae0807cdd3f241f81a8e933065437f6;p=tinc

diff --git a/src/names.c b/src/names.c
index 5a5270a9..c42b9534 100644
--- a/src/names.c
+++ b/src/names.c
@@ -27,6 +27,7 @@ char *netname = NULL;
 char *confdir = NULL;           /* base configuration directory */
 char *confbase = NULL;          /* base configuration directory for this instance of tinc */
 char *identname = NULL;         /* program name for syslog */
+char *unixsocketname = NULL;    /* UNIX socket location */
 char *logfilename = NULL;       /* log file location */
 char *pidfilename = NULL;
 char *program_name = NULL;
@@ -65,7 +66,7 @@ void make_names(void) {
 	}
 #endif
 	if(!confdir)
-		confdir = xstrdup(CONFDIR);
+		confdir = xstrdup(CONFDIR SLASH "tinc");
 
 	if(!logfilename)
 		xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname);
@@ -73,6 +74,9 @@ void make_names(void) {
 	if(!pidfilename)
 		xasprintf(&pidfilename, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
 
+	if(!unixsocketname)
+		xasprintf(&unixsocketname, LOCALSTATEDIR SLASH "run" SLASH "%s.socket", identname);
+
 	if(netname) {
 		if(!confbase)
 			xasprintf(&confbase, CONFDIR SLASH "tinc" SLASH "%s", netname);
@@ -87,6 +91,7 @@ void make_names(void) {
 void free_names(void) {
 	free(identname);
 	free(netname);
+	free(unixsocketname);
 	free(pidfilename);
 	free(logfilename);
 	free(confbase);