From bc3e363d30cb9b038808edd2fcde3b34cd3a9d6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Vavru=C5=A1a?= <marek.vavrusa@nic.cz>
Date: Wed, 30 Sep 2015 19:01:28 +0200
Subject: [PATCH] daemon: check that keyfile is readable and use abspath
---
daemon/main.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/daemon/main.c b/daemon/main.c
index bbebdab0b..cd233b88b 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -197,7 +197,8 @@ int main(int argc, char **argv)
int forks = 1;
array_t(char*) addr_set;
array_init(addr_set);
- const char *keyfile = NULL;
+ char *keyfile = NULL;
+ static char keyfile_buf[PATH_MAX + 1];
/* Long options. */
int c = 0, li = 0, ret = 0;
@@ -225,9 +226,9 @@ int main(int argc, char **argv)
}
break;
case 'k':
- keyfile = optarg;
- if (access(optarg, R_OK) != 0) {
- log_error("[system] keyfile '%s': not readable\n", optarg);
+ keyfile = realpath(optarg, keyfile_buf);
+ if (!keyfile || access(optarg, R_OK|W_OK) != 0) {
+ log_error("[system] keyfile '%s': not readable/writeable\n", optarg);
return EXIT_FAILURE;
}
break;
--
GitLab