diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2017-05-06 17:51:11 +0200 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2017-05-06 17:51:17 +0200 |
| commit | 6f01709adb0e849c4f4d55786e5e471cbe3878e8 (patch) | |
| tree | 6344be7c90ed55349cccea9a52090bcfc86c6152 /community/tinc-pre/tinc-1.1-fix-paths.patch | |
| parent | 49751a9a67e7bf6df04a474f6734989441148949 (diff) | |
| download | aports-6f01709adb0e849c4f4d55786e5e471cbe3878e8.tar.bz2 aports-6f01709adb0e849c4f4d55786e5e471cbe3878e8.tar.xz | |
community/tinc-pre: fix init and move to community
Diffstat (limited to 'community/tinc-pre/tinc-1.1-fix-paths.patch')
| -rw-r--r-- | community/tinc-pre/tinc-1.1-fix-paths.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/community/tinc-pre/tinc-1.1-fix-paths.patch b/community/tinc-pre/tinc-1.1-fix-paths.patch new file mode 100644 index 0000000000..519677dd50 --- /dev/null +++ b/community/tinc-pre/tinc-1.1-fix-paths.patch @@ -0,0 +1,44 @@ +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); + #else +- bool fallback = false; +- if(daemon) { +- 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); +- 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) +- xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname); +- +- if(!pidfilename) +- xasprintf(&pidfilename, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname); +- } else { +- if(!logfilename) +- xasprintf(&logfilename, "%s" SLASH "log", confbase); +- +- if(!pidfilename) { +- 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(!pidfilename) ++ xasprintf(&pidfilename, "/run" SLASH "%s.pid", identname); + #endif + + if(!unixsocketname) { |