diff options
author | David Oberhollenzer <david.oberhollenzer@tele2.at> | 2018-05-27 10:15:03 +0200 |
---|---|---|
committer | David Oberhollenzer <david.oberhollenzer@tele2.at> | 2018-06-09 15:32:29 +0200 |
commit | ed23d075cae1353dcbec06925b2491e09395aafe (patch) | |
tree | f1793472ddc02015aebda72df8ceeeb22dfadab8 /initd | |
parent | bf63f78b6698f33ed3acbd4aed8822a35688c1ba (diff) |
Make mksock() more generic, move to util library
Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
Diffstat (limited to 'initd')
-rw-r--r-- | initd/Makemodule.am | 2 | ||||
-rw-r--r-- | initd/init.h | 12 | ||||
-rw-r--r-- | initd/main.c | 2 | ||||
-rw-r--r-- | initd/mksock.c | 71 |
4 files changed, 2 insertions, 85 deletions
diff --git a/initd/Makemodule.am b/initd/Makemodule.am index 661742a..f740885 100644 --- a/initd/Makemodule.am +++ b/initd/Makemodule.am @@ -1,5 +1,5 @@ init_SOURCES = initd/main.c initd/init.h initd/signal_linux.c initd/runsvc.c -init_SOURCES += initd/status.c initd/mksock.c initd/svclist.c +init_SOURCES += initd/status.c initd/svclist.c init_CPPFLAGS = $(AM_CPPFLAGS) init_CFLAGS = $(AM_CFLAGS) init_LDFLAGS = $(AM_LDFLAGS) diff --git a/initd/init.h b/initd/init.h index d07f310..2c39489 100644 --- a/initd/init.h +++ b/initd/init.h @@ -64,18 +64,6 @@ int runsvc_wait(service_t *svc); */ void print_status(const char *msg, int type, bool update); -/********** mksock.c **********/ - -/* - Create a UNIX socket that programs can use to pass messages to init. - - Returns the socked fd or -1 on failure. The function takes care of - printing error messages on failure. - - The socket has the CLOEXEC flag set. -*/ -int mksock(void); - /********** svclist.c **********/ /* diff --git a/initd/main.c b/initd/main.c index 8adbe2f..2cacf12 100644 --- a/initd/main.c +++ b/initd/main.c @@ -207,7 +207,7 @@ int main(void) runlevel = target; if (target == TGT_BOOT && ti_sock == -1) { - ti_sock = mksock(); + ti_sock = mksock(INITSOCK, SOCK_FLAG_ROOT_ONLY); if (ti_sock != -1) { pfd[1].fd = ti_sock; pfd[1].events = POLLIN; diff --git a/initd/mksock.c b/initd/mksock.c deleted file mode 100644 index 0ec6b68..0000000 --- a/initd/mksock.c +++ /dev/null @@ -1,71 +0,0 @@ -/* SPDX-License-Identifier: GPL-3.0-or-later */ -/* - * Copyright (C) 2018 - David Oberhollenzer - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <https://www.gnu.org/licenses/>. - */ -#include <sys/types.h> -#include <sys/socket.h> -#include <sys/stat.h> -#include <sys/un.h> -#include <unistd.h> -#include <string.h> -#include <fcntl.h> -#include <stdio.h> - -#include "telinit.h" -#include "init.h" - -int mksock(void) -{ - struct sockaddr_un un; - int fd; - - fd = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0); - if (fd < 0) { - perror("socket"); - return -1; - } - - memset(&un, 0, sizeof(un)); - un.sun_family = AF_UNIX; - - strcpy(un.sun_path, INITSOCK); - - if (bind(fd, (struct sockaddr *)&un, sizeof(un))) { - perror("bind: " INITSOCK); - goto fail; - } - - if (chown(INITSOCK, 0, 0)) { - perror("chown: " INITSOCK); - goto fail; - } - - if (chmod(INITSOCK, 0770)) { - perror("chmod: " INITSOCK); - goto fail; - } - - if (listen(fd, 10)) { - perror("listen"); - goto fail; - } - - return fd; -fail: - close(fd); - unlink(INITSOCK); - return -1; -} |