summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Fedoryshchenko <denys.f@collabora.com>2026-06-23 18:33:34 +0300
committerGitHub <noreply@github.com>2026-06-23 18:33:34 +0300
commitb65693d4834f9bb7fc90429beea3ac5d4b2c6797 (patch)
tree3b17b3bec9730e6f3e34a8b8ae71240ba4b4cb7f
parent6a2dfa19254637ac8d844550d9bd36b7467c181f (diff)
parent5fc07183e90b5ce7c9d3ede955266ba575388965 (diff)
downloadaccel-ppp-b65693d4834f9bb7fc90429beea3ac5d4b2c6797.tar.gz
accel-ppp-b65693d4834f9bb7fc90429beea3ac5d4b2c6797.zip
Merge pull request #319 from nuclearcat/log-file-fixes-improvements
log_file: don't register general target when log-file is unset
-rw-r--r--accel-pppd/logs/log_file.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/accel-pppd/logs/log_file.c b/accel-pppd/logs/log_file.c
index a6bb1fe4..26dd4422 100644
--- a/accel-pppd/logs/log_file.c
+++ b/accel-pppd/logs/log_file.c
@@ -385,7 +385,12 @@ static void general_reopen(void)
{
const char *fname = conf_get_opt("log", "log-file");
int old_fd = -1;
- int fd = open(fname, O_WRONLY | O_CREAT | O_APPEND | O_CLOEXEC, S_IRUSR | S_IWUSR);
+ int fd;
+
+ if (!fname)
+ return;
+
+ fd = open(fname, O_WRONLY | O_CREAT | O_APPEND | O_CLOEXEC, S_IRUSR | S_IWUSR);
if (fd < 0) {
log_emerg("log_file: open '%s': %s\n", fname, strerror(errno));
return;
@@ -710,7 +715,8 @@ static void init(void)
if (opt && atoi(opt) > 0)
conf_copy = 1;
- log_register_target(&general_target);
+ if (log_file)
+ log_register_target(&general_target);
if (conf_per_user_dir) {
log_register_target(&per_user_target);