From f5c88312c3fc5b7dc944eb36c2b8c62a44b78798 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>

Date: Sun, 24 Jan 2021 21:19:51 +0100

Subject: [PATCH 2/2] Remove bundled copy of sd-daemon.[ch]

Let's just use the system version.

---

 Makefile.am    |  10 +-

 rtkit-daemon.c |   2 +-

 sd-daemon.c    | 520 -------------------------------------------------

 sd-daemon.h    | 282 ---------------------------

 4 files changed, 4 insertions(+), 810 deletions(-)

 delete mode 100644 sd-daemon.c

 delete mode 100644 sd-daemon.h

diff --git a/Makefile.am b/Makefile.am

index febc35535d..2217a80b3c 100644

--- a/Makefile.am

+++ b/Makefile.am

@@ -56,10 +56,10 @@ systemdsystemunit_DATA = \

 endif

 rtkit_daemon_SOURCES = \

-	rtkit-daemon.c rtkit.h \

-	sd-daemon.c sd-daemon.h

+	rtkit-daemon.c rtkit.h

 rtkit_daemon_LDADD = \

-	$(DBUS_LIBS)

+	$(DBUS_LIBS) \

+        -lsystemd

 rtkit_daemon_CFLAGS = \

 	$(AM_CFLAGS) \

 	$(DBUS_CFLAGS)

@@ -93,7 +93,3 @@ EXTRA_DIST += \

 DISTCHECK_CONFIGURE_FLAGS = \

 	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)

-

-update-systemd:

-	curl http://cgit.freedesktop.org/systemd/systemd/plain/src/libsystemd-daemon/sd-daemon.c > sd-daemon.c

-	curl http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h > sd-daemon.h

diff --git a/rtkit-daemon.c b/rtkit-daemon.c

index a15e84f8f5..fdff7f63dc 100644

--- a/rtkit-daemon.c

+++ b/rtkit-daemon.c

@@ -50,9 +50,9 @@

 #include <dirent.h>

 #include <syslog.h>

 #include <grp.h>

+#include <systemd/sd-daemon.h>

 #include "rtkit.h"

-#include "sd-daemon.h"

 #ifndef __linux__

 #error "This stuff only works on Linux!"

diff --git a/sd-daemon.c b/sd-daemon.c

deleted file mode 100644

index 485b301023..0000000000

--- a/sd-daemon.c

+++ /dev/null

@@ -1,520 +0,0 @@

-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/

-

-/***

-  Copyright 2010 Lennart Poettering

-

-  Permission is hereby granted, free of charge, to any person

-  obtaining a copy of this software and associated documentation files

-  (the "Software"), to deal in the Software without restriction,

-  including without limitation the rights to use, copy, modify, merge,

-  publish, distribute, sublicense, and/or sell copies of the Software,

-  and to permit persons to whom the Software is furnished to do so,

-  subject to the following conditions:

-

-  The above copyright notice and this permission notice shall be

-  included in all copies or substantial portions of the Software.

-

-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

-  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

-  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-  SOFTWARE.

-***/

-

-#ifndef _GNU_SOURCE

-#  define _GNU_SOURCE

-#endif

-

-#include <sys/types.h>

-#include <sys/stat.h>

-#include <sys/socket.h>

-#include <sys/un.h>

-#include <fcntl.h>

-#include <netinet/in.h>

-#include <stdlib.h>

-#include <errno.h>

-#include <unistd.h>

-#include <string.h>

-#include <stdarg.h>

-#include <stdio.h>

-#include <stddef.h>

-#include <limits.h>

-

-#if defined(__linux__) && !defined(SD_DAEMON_DISABLE_MQ)

-#  include <mqueue.h>

-#endif

-

-#include "sd-daemon.h"

-

-#if (__GNUC__ >= 4)

-#  ifdef SD_EXPORT_SYMBOLS

-/* Export symbols */

-#    define _sd_export_ __attribute__ ((visibility("default")))

-#  else

-/* Don't export the symbols */

-#    define _sd_export_ __attribute__ ((visibility("hidden")))

-#  endif

-#else

-#  define _sd_export_

-#endif

-

-_sd_export_ int sd_listen_fds(int unset_environment) {

-

-#if defined(DISABLE_SYSTEMD) || !defined(__linux__)

-        return 0;

-#else

-        int r, fd;

-        const char *e;

-        char *p = NULL;

-        unsigned long l;

-

-        e = getenv("LISTEN_PID");

-        if (!e) {

-                r = 0;

-                goto finish;

-        }

-

-        errno = 0;

-        l = strtoul(e, &p, 10);

-

-        if (errno > 0) {

-                r = -errno;

-                goto finish;

-        }

-

-        if (!p || p == e || *p || l <= 0) {

-                r = -EINVAL;

-                goto finish;

-        }

-

-        /* Is this for us? */

-        if (getpid() != (pid_t) l) {

-                r = 0;

-                goto finish;

-        }

-

-        e = getenv("LISTEN_FDS");

-        if (!e) {

-                r = 0;

-                goto finish;

-        }

-

-        errno = 0;

-        l = strtoul(e, &p, 10);

-

-        if (errno > 0) {

-                r = -errno;

-                goto finish;

-        }

-

-        if (!p || p == e || *p) {

-                r = -EINVAL;

-                goto finish;

-        }

-

-        for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + (int) l; fd ++) {

-                int flags;

-

-                flags = fcntl(fd, F_GETFD);

-                if (flags < 0) {

-                        r = -errno;

-                        goto finish;

-                }

-

-                if (flags & FD_CLOEXEC)

-                        continue;

-

-                if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) < 0) {

-                        r = -errno;

-                        goto finish;

-                }

-        }

-

-        r = (int) l;

-

-finish:

-        if (unset_environment) {

-                unsetenv("LISTEN_PID");

-                unsetenv("LISTEN_FDS");

-        }

-

-        return r;

-#endif

-}

-

-_sd_export_ int sd_is_fifo(int fd, const char *path) {

-        struct stat st_fd;

-

-        if (fd < 0)

-                return -EINVAL;

-

-        if (fstat(fd, &st_fd) < 0)

-                return -errno;

-

-        if (!S_ISFIFO(st_fd.st_mode))

-                return 0;

-

-        if (path) {

-                struct stat st_path;

-

-                if (stat(path, &st_path) < 0) {

-

-                        if (errno == ENOENT || errno == ENOTDIR)

-                                return 0;

-

-                        return -errno;

-                }

-

-                return

-                        st_path.st_dev == st_fd.st_dev &&

-                        st_path.st_ino == st_fd.st_ino;

-        }

-

-        return 1;

-}

-

-_sd_export_ int sd_is_special(int fd, const char *path) {

-        struct stat st_fd;

-

-        if (fd < 0)

-                return -EINVAL;

-

-        if (fstat(fd, &st_fd) < 0)

-                return -errno;

-

-        if (!S_ISREG(st_fd.st_mode) && !S_ISCHR(st_fd.st_mode))

-                return 0;

-

-        if (path) {

-                struct stat st_path;

-

-                if (stat(path, &st_path) < 0) {

-

-                        if (errno == ENOENT || errno == ENOTDIR)

-                                return 0;

-

-                        return -errno;

-                }

-

-                if (S_ISREG(st_fd.st_mode) && S_ISREG(st_path.st_mode))

-                        return

-                                st_path.st_dev == st_fd.st_dev &&

-                                st_path.st_ino == st_fd.st_ino;

-                else if (S_ISCHR(st_fd.st_mode) && S_ISCHR(st_path.st_mode))

-                        return st_path.st_rdev == st_fd.st_rdev;

-                else

-                        return 0;

-        }

-

-        return 1;

-}

-

-static int sd_is_socket_internal(int fd, int type, int listening) {

-        struct stat st_fd;

-

-        if (fd < 0 || type < 0)

-                return -EINVAL;

-

-        if (fstat(fd, &st_fd) < 0)

-                return -errno;

-

-        if (!S_ISSOCK(st_fd.st_mode))

-                return 0;

-

-        if (type != 0) {

-                int other_type = 0;

-                socklen_t l = sizeof(other_type);

-

-                if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &other_type, &l) < 0)

-                        return -errno;

-

-                if (l != sizeof(other_type))

-                        return -EINVAL;

-

-                if (other_type != type)

-                        return 0;

-        }

-

-        if (listening >= 0) {

-                int accepting = 0;

-                socklen_t l = sizeof(accepting);

-

-                if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &accepting, &l) < 0)

-                        return -errno;

-

-                if (l != sizeof(accepting))

-                        return -EINVAL;

-

-                if (!accepting != !listening)

-                        return 0;

-        }

-

-        return 1;

-}

-

-union sockaddr_union {

-        struct sockaddr sa;

-        struct sockaddr_in in4;

-        struct sockaddr_in6 in6;

-        struct sockaddr_un un;

-        struct sockaddr_storage storage;

-};

-

-_sd_export_ int sd_is_socket(int fd, int family, int type, int listening) {

-        int r;

-

-        if (family < 0)

-                return -EINVAL;

-

-        r = sd_is_socket_internal(fd, type, listening);

-        if (r <= 0)

-                return r;

-

-        if (family > 0) {

-                union sockaddr_union sockaddr = {};

-                socklen_t l = sizeof(sockaddr);

-

-                if (getsockname(fd, &sockaddr.sa, &l) < 0)

-                        return -errno;

-

-                if (l < sizeof(sa_family_t))

-                        return -EINVAL;

-

-                return sockaddr.sa.sa_family == family;

-        }

-

-        return 1;

-}

-

-_sd_export_ int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) {

-        union sockaddr_union sockaddr = {};

-        socklen_t l = sizeof(sockaddr);

-        int r;

-

-        if (family != 0 && family != AF_INET && family != AF_INET6)

-                return -EINVAL;

-

-        r = sd_is_socket_internal(fd, type, listening);

-        if (r <= 0)

-                return r;

-

-        if (getsockname(fd, &sockaddr.sa, &l) < 0)

-                return -errno;

-

-        if (l < sizeof(sa_family_t))

-                return -EINVAL;

-

-        if (sockaddr.sa.sa_family != AF_INET &&

-            sockaddr.sa.sa_family != AF_INET6)

-                return 0;

-

-        if (family > 0)

-                if (sockaddr.sa.sa_family != family)

-                        return 0;

-

-        if (port > 0) {

-                if (sockaddr.sa.sa_family == AF_INET) {

-                        if (l < sizeof(struct sockaddr_in))

-                                return -EINVAL;

-

-                        return htons(port) == sockaddr.in4.sin_port;

-                } else {

-                        if (l < sizeof(struct sockaddr_in6))

-                                return -EINVAL;

-

-                        return htons(port) == sockaddr.in6.sin6_port;

-                }

-        }

-

-        return 1;

-}

-

-_sd_export_ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) {

-        union sockaddr_union sockaddr = {};

-        socklen_t l = sizeof(sockaddr);

-        int r;

-

-        r = sd_is_socket_internal(fd, type, listening);

-        if (r <= 0)

-                return r;

-

-        if (getsockname(fd, &sockaddr.sa, &l) < 0)

-                return -errno;

-

-        if (l < sizeof(sa_family_t))

-                return -EINVAL;

-

-        if (sockaddr.sa.sa_family != AF_UNIX)

-                return 0;

-

-        if (path) {

-                if (length == 0)

-                        length = strlen(path);

-

-                if (length == 0)

-                        /* Unnamed socket */

-                        return l == offsetof(struct sockaddr_un, sun_path);

-

-                if (path[0])

-                        /* Normal path socket */

-                        return

-                                (l >= offsetof(struct sockaddr_un, sun_path) + length + 1) &&

-                                memcmp(path, sockaddr.un.sun_path, length+1) == 0;

-                else

-                        /* Abstract namespace socket */

-                        return

-                                (l == offsetof(struct sockaddr_un, sun_path) + length) &&

-                                memcmp(path, sockaddr.un.sun_path, length) == 0;

-        }

-

-        return 1;

-}

-

-_sd_export_ int sd_is_mq(int fd, const char *path) {

-#if !defined(__linux__) || defined(SD_DAEMON_DISABLE_MQ)

-        return 0;

-#else

-        struct mq_attr attr;

-

-        if (fd < 0)

-                return -EINVAL;

-

-        if (mq_getattr(fd, &attr) < 0)

-                return -errno;

-

-        if (path) {

-                char fpath[PATH_MAX];

-                struct stat a, b;

-

-                if (path[0] != '/')

-                        return -EINVAL;

-

-                if (fstat(fd, &a) < 0)

-                        return -errno;

-

-                strncpy(stpcpy(fpath, "/dev/mqueue"), path, sizeof(fpath) - 12);

-                fpath[sizeof(fpath)-1] = 0;

-

-                if (stat(fpath, &b) < 0)

-                        return -errno;

-

-                if (a.st_dev != b.st_dev ||

-                    a.st_ino != b.st_ino)

-                        return 0;

-        }

-

-        return 1;

-#endif

-}

-

-_sd_export_ int sd_notify(int unset_environment, const char *state) {

-#if defined(DISABLE_SYSTEMD) || !defined(__linux__) || !defined(SOCK_CLOEXEC)

-        return 0;

-#else

-        int fd = -1, r;

-        struct msghdr msghdr;

-        struct iovec iovec;

-        union sockaddr_union sockaddr;

-        const char *e;

-

-        if (!state) {

-                r = -EINVAL;

-                goto finish;

-        }

-

-        e = getenv("NOTIFY_SOCKET");

-        if (!e)

-                return 0;

-

-        /* Must be an abstract socket, or an absolute path */

-        if ((e[0] != '@' && e[0] != '/') || e[1] == 0) {

-                r = -EINVAL;

-                goto finish;

-        }

-

-        fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0);

-        if (fd < 0) {

-                r = -errno;

-                goto finish;

-        }

-

-        memset(&sockaddr, 0, sizeof(sockaddr));

-        sockaddr.sa.sa_family = AF_UNIX;

-        strncpy(sockaddr.un.sun_path, e, sizeof(sockaddr.un.sun_path));

-

-        if (sockaddr.un.sun_path[0] == '@')

-                sockaddr.un.sun_path[0] = 0;

-

-        memset(&iovec, 0, sizeof(iovec));

-        iovec.iov_base = (char*) state;

-        iovec.iov_len = strlen(state);

-

-        memset(&msghdr, 0, sizeof(msghdr));

-        msghdr.msg_name = &sockaddr;

-        msghdr.msg_namelen = offsetof(struct sockaddr_un, sun_path) + strlen(e);

-

-        if (msghdr.msg_namelen > sizeof(struct sockaddr_un))

-                msghdr.msg_namelen = sizeof(struct sockaddr_un);

-

-        msghdr.msg_iov = &iovec;

-        msghdr.msg_iovlen = 1;

-

-        if (sendmsg(fd, &msghdr, MSG_NOSIGNAL) < 0) {

-                r = -errno;

-                goto finish;

-        }

-

-        r = 1;

-

-finish:

-        if (unset_environment)

-                unsetenv("NOTIFY_SOCKET");

-

-        if (fd >= 0)

-                close(fd);

-

-        return r;

-#endif

-}

-

-_sd_export_ int sd_notifyf(int unset_environment, const char *format, ...) {

-#if defined(DISABLE_SYSTEMD) || !defined(__linux__)

-        return 0;

-#else

-        va_list ap;

-        char *p = NULL;

-        int r;

-

-        va_start(ap, format);

-        r = vasprintf(&p, format, ap);

-        va_end(ap);

-

-        if (r < 0 || !p)

-                return -ENOMEM;

-

-        r = sd_notify(unset_environment, p);

-        free(p);

-

-        return r;

-#endif

-}

-

-_sd_export_ int sd_booted(void) {

-#if defined(DISABLE_SYSTEMD) || !defined(__linux__)

-        return 0;

-#else

-        struct stat st;

-

-        /* We test whether the runtime unit file directory has been

-         * created. This takes place in mount-setup.c, so is

-         * guaranteed to happen very early during boot. */

-

-        if (lstat("/run/systemd/system/", &st) < 0)

-                return 0;

-

-        return !!S_ISDIR(st.st_mode);

-#endif

-}

diff --git a/sd-daemon.h b/sd-daemon.h

deleted file mode 100644

index daa3f4c857..0000000000

--- a/sd-daemon.h

+++ /dev/null

@@ -1,282 +0,0 @@

-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/

-

-#ifndef foosddaemonhfoo

-#define foosddaemonhfoo

-

-/***

-  Copyright 2010 Lennart Poettering

-

-  Permission is hereby granted, free of charge, to any person

-  obtaining a copy of this software and associated documentation files

-  (the "Software"), to deal in the Software without restriction,

-  including without limitation the rights to use, copy, modify, merge,

-  publish, distribute, sublicense, and/or sell copies of the Software,

-  and to permit persons to whom the Software is furnished to do so,

-  subject to the following conditions:

-

-  The above copyright notice and this permission notice shall be

-  included in all copies or substantial portions of the Software.

-

-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

-  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

-  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-  SOFTWARE.

-***/

-

-#include <sys/types.h>

-#include <inttypes.h>

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-/*

-  Reference implementation of a few systemd related interfaces for

-  writing daemons. These interfaces are trivial to implement. To

-  simplify porting we provide this reference implementation.

-  Applications are welcome to reimplement the algorithms described

-  here if they do not want to include these two source files.

-

-  The following functionality is provided:

-

-  - Support for logging with log levels on stderr

-  - File descriptor passing for socket-based activation

-  - Daemon startup and status notification

-  - Detection of systemd boots

-

-  You may compile this with -DDISABLE_SYSTEMD to disable systemd

-  support. This makes all those calls NOPs that are directly related to

-  systemd (i.e. only sd_is_xxx() will stay useful).

-

-  Since this is drop-in code we don't want any of our symbols to be

-  exported in any case. Hence we declare hidden visibility for all of

-  them.

-

-  You may find an up-to-date version of these source files online:

-

-  http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h

-  http://cgit.freedesktop.org/systemd/systemd/plain/src/libsystemd-daemon/sd-daemon.c

-

-  This should compile on non-Linux systems, too, but with the

-  exception of the sd_is_xxx() calls all functions will become NOPs.

-

-  See sd-daemon(3) for more information.

-*/

-

-#ifndef _sd_printf_attr_

-#  if __GNUC__ >= 4

-#    define _sd_printf_attr_(a,b) __attribute__ ((format (printf, a, b)))

-#  else

-#    define _sd_printf_attr_(a,b)

-#  endif

-#endif

-

-/*

-  Log levels for usage on stderr:

-

-          fprintf(stderr, SD_NOTICE "Hello World!\n");

-

-  This is similar to printk() usage in the kernel.

-*/

-#define SD_EMERG   "<0>"  /* system is unusable */

-#define SD_ALERT   "<1>"  /* action must be taken immediately */

-#define SD_CRIT    "<2>"  /* critical conditions */

-#define SD_ERR     "<3>"  /* error conditions */

-#define SD_WARNING "<4>"  /* warning conditions */

-#define SD_NOTICE  "<5>"  /* normal but significant condition */

-#define SD_INFO    "<6>"  /* informational */

-#define SD_DEBUG   "<7>"  /* debug-level messages */

-

-/* The first passed file descriptor is fd 3 */

-#define SD_LISTEN_FDS_START 3

-

-/*

-  Returns how many file descriptors have been passed, or a negative

-  errno code on failure. Optionally, removes the $LISTEN_FDS and

-  $LISTEN_PID file descriptors from the environment (recommended, but

-  problematic in threaded environments). If r is the return value of

-  this function you'll find the file descriptors passed as fds

-  SD_LISTEN_FDS_START to SD_LISTEN_FDS_START+r-1. Returns a negative

-  errno style error code on failure. This function call ensures that

-  the FD_CLOEXEC flag is set for the passed file descriptors, to make

-  sure they are not passed on to child processes. If FD_CLOEXEC shall

-  not be set, the caller needs to unset it after this call for all file

-  descriptors that are used.

-

-  See sd_listen_fds(3) for more information.

-*/

-int sd_listen_fds(int unset_environment);

-

-/*

-  Helper call for identifying a passed file descriptor. Returns 1 if

-  the file descriptor is a FIFO in the file system stored under the

-  specified path, 0 otherwise. If path is NULL a path name check will

-  not be done and the call only verifies if the file descriptor

-  refers to a FIFO. Returns a negative errno style error code on

-  failure.

-

-  See sd_is_fifo(3) for more information.

-*/

-int sd_is_fifo(int fd, const char *path);

-

-/*

-  Helper call for identifying a passed file descriptor. Returns 1 if

-  the file descriptor is a special character device on the file

-  system stored under the specified path, 0 otherwise.

-  If path is NULL a path name check will not be done and the call

-  only verifies if the file descriptor refers to a special character.