daemon: check that keyfile is readable and use abspath

diff --git a/daemon/main.c b/daemon/main.c
index bbebdab0b8ec5233f079cd8da7018c7838638859..cd233b88bfad62cdb586c9086c8210bc4b8e145b 100644 (file)
--- 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;