From d1d9ddf98d39b0bdc055060fb962335439445690 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 4 Dec 2020 09:53:11 +0000 Subject: ubusd: attempt to create socket folder When ubus is running as root, /var/run/ubus most likely hasn't been created as well (as that's the homedir of user ubus, and if a user ubus was found, then ubus would run being that user). Blindly attempt to create the directory (which won't do any harm if it does exist and/or ubus is not running as root) to still be able to start ubus in case of user ubus not existing. Signed-off-by: Daniel Golle --- ubusd_main.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/ubusd_main.c b/ubusd_main.c index f977ff3..c3d8049 100644 --- a/ubusd_main.c +++ b/ubusd_main.c @@ -6,9 +6,11 @@ #include #include +#include #ifdef FreeBSD #include #endif +#include #include #include @@ -229,6 +231,19 @@ static void sighup_handler(int sig) ubusd_acl_load(); } +static void mkdir_sockdir() +{ + char *ubus_sock_dir, *tmp; + + ubus_sock_dir = strdup(UBUS_UNIX_SOCKET); + tmp = strrchr(ubus_sock_dir, '/'); + if (tmp) { + *tmp = '\0'; + mkdir(ubus_sock_dir, 0755); + } + free(ubus_sock_dir); +} + int main(int argc, char **argv) { const char *ubus_socket = UBUS_UNIX_SOCKET; @@ -254,6 +269,7 @@ int main(int argc, char **argv) } } + mkdir_sockdir(); unlink(ubus_socket); umask(0111); server_fd.fd = usock(USOCK_UNIX | USOCK_SERVER | USOCK_NONBLOCK, ubus_socket, NULL); -- cgit v1.2.1