From 4672795e1a42a4a1fd25630ba840aee3e6bc4349 Mon Sep 17 00:00:00 2001 From: darosior Date: Wed, 4 Sep 2019 13:16:23 +0200 Subject: [PATCH] lightningd: don't join the config_dir to the pid_file path --- CHANGELOG.md | 2 ++ lightningd/lightningd.c | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf1c39d7d..ebcd10e04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,8 @@ changes. ### Fixed +- Relative `--lightning_dir` is now working again. + ### Security ## [0.7.2.1] - 2019-08-19: "Nakamoto's Pre-approval by US Congress" diff --git a/lightningd/lightningd.c b/lightningd/lightningd.c index 67f1900a9..53ac077ab 100644 --- a/lightningd/lightningd.c +++ b/lightningd/lightningd.c @@ -543,9 +543,8 @@ static void pidfile_create(const struct lightningd *ld) int pid_fd; char *pid; - /* Create PID file: relative to .config dir unless absolute. */ - pid_fd = open(path_join(tmpctx, ld->config_dir, ld->pidfile), - O_WRONLY|O_CREAT, 0640); + /* Create PID file: relative to .config dir. */ + pid_fd = open(ld->pidfile, O_WRONLY|O_CREAT, 0640); if (pid_fd < 0) err(1, "Failed to open PID file");