Remove support for Subnets.

[meshlink] / src / names.c

diff --git a/src/names.c b/src/names.c
index a631ad97e7fcde60c0216e66d7324bf55952db72..138c3cc08cd5bc4ad98ae5f609e51dc158b2bb8f 100644 (file)
--- a/src/names.c
+++ b/src/names.c
@@ -26,6 +26,7 @@
 char *netname = NULL;
 char *confdir = NULL;           /* base configuration directory */
 char *confbase = NULL;          /* base configuration directory for this instance of tinc */
+bool confbase_given;
 char *identname = NULL;         /* program name for syslog */
 char *unixsocketname = NULL;    /* UNIX socket location */
 char *logfilename = NULL;       /* log file location */
@@ -41,6 +42,7 @@ void make_names(void) {
        char installdir[1024] = "";
        DWORD len = sizeof installdir;
 #endif
+       confbase_given = confbase;
 
        if(netname && confbase)
                logger(DEBUG_ALWAYS, LOG_INFO, "Both netname and configuration directory given, using the latter...");
@@ -75,7 +77,7 @@ void make_names(void) {
                xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname);
 
        if(!pidfilename)
-               xasprintf(&pidfilename, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
+               xasprintf(&pidfilename, SLASH "tmp" SLASH "%s.pid", identname);
 
        if(!unixsocketname) {
                int len = strlen(pidfilename);