diff options
Diffstat (limited to 'community/tinc-pre/tinc-1.1-fix-paths.patch')
| -rw-r--r-- | community/tinc-pre/tinc-1.1-fix-paths.patch | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/community/tinc-pre/tinc-1.1-fix-paths.patch b/community/tinc-pre/tinc-1.1-fix-paths.patch index 519677dd50..9593904042 100644 --- a/community/tinc-pre/tinc-1.1-fix-paths.patch +++ b/community/tinc-pre/tinc-1.1-fix-paths.patch @@ -1,42 +1,54 @@ -diff -Naur tinc-1.1pre14.orig/src/names.c tinc-1.1pre14/src/names.c ---- tinc-1.1pre14.orig/src/names.c 2016-04-17 12:08:41.000000000 -0400 -+++ tinc-1.1pre14/src/names.c 2016-10-15 07:37:51.147064396 -0400 -@@ -86,36 +86,11 @@ - if(!pidfilename) - xasprintf(&pidfilename, "%s" SLASH "pid", confbase); +diff --git a/src/names.c b/src/names.c +index 603b536..44064ec 100644 +--- a/src/names.c ++++ b/src/names.c +@@ -104,47 +104,11 @@ void make_names(bool daemon) { + } + #else - bool fallback = false; +- - if(daemon) { -- if(access(LOCALSTATEDIR, R_OK | W_OK | X_OK)) +- if(access(LOCALSTATEDIR, R_OK | W_OK | X_OK)) { - fallback = true; +- } - } else { - char fname[PATH_MAX]; -- snprintf(fname, sizeof fname, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname); +- snprintf(fname, sizeof(fname), LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname); +- - if(access(fname, R_OK)) { -- snprintf(fname, sizeof fname, "%s" SLASH "pid", confbase); -- if(!access(fname, R_OK)) +- snprintf(fname, sizeof(fname), "%s" SLASH "pid", confbase); +- +- if(!access(fname, R_OK)) { - fallback = true; +- } - } - } -+ if(!logfilename) -+ xasprintf(&logfilename, "/var/log" SLASH "%s.log", identname); - +- - if(!fallback) { -- if(!logfilename) +- if(!logfilename) { - xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname); +- } - -- if(!pidfilename) +- if(!pidfilename) { - xasprintf(&pidfilename, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname); +- } - } else { -- if(!logfilename) +- if(!logfilename) { - xasprintf(&logfilename, "%s" SLASH "log", confbase); +- } - - if(!pidfilename) { -- if(daemon) +- if(daemon) { - logger(DEBUG_ALWAYS, LOG_WARNING, "Could not access " LOCALSTATEDIR SLASH " (%s), storing pid and socket files in %s" SLASH, strerror(errno), confbase); +- } +- - xasprintf(&pidfilename, "%s" SLASH "pid", confbase); - } - } ++ if(!logfilename) ++ xasprintf(&logfilename, "/var/log" SLASH "%s.log", identname); + + if(!pidfilename) + xasprintf(&pidfilename, "/run" SLASH "%s.pid", identname); #endif |