chiark / gitweb /
util: move all to shared/ and split external dependencies in separate internal libraries
authorKay Sievers <kay@vrfy.org>
Tue, 10 Apr 2012 11:39:02 +0000 (13:39 +0200)
committerKay Sievers <kay@vrfy.org>
Tue, 10 Apr 2012 12:13:38 +0000 (14:13 +0200)
Before:
  $ ldd /lib/systemd/systemd-timestamp
  linux-vdso.so.1 =>  (0x00007fffb05ff000)
  libselinux.so.1 => /lib64/libselinux.so.1 (0x00007f90aac57000)
  libcap.so.2 => /lib64/libcap.so.2 (0x00007f90aaa53000)
  librt.so.1 => /lib64/librt.so.1 (0x00007f90aa84a000)
  libc.so.6 => /lib64/libc.so.6 (0x00007f90aa494000)
  /lib64/ld-linux-x86-64.so.2 (0x00007f90aae90000)
  libdl.so.2 => /lib64/libdl.so.2 (0x00007f90aa290000)
  libattr.so.1 => /lib64/libattr.so.1 (0x00007f90aa08a000)
  libpthread.so.0 => /lib64/libpthread.so.0 (0x00007f90a9e6e000)

After:
  $ ldd systemd-timestamp
  linux-vdso.so.1 =>  (0x00007fff3cbff000)
  libselinux.so.1 => /lib64/libselinux.so.1 (0x00007f5eaa1c3000)
  librt.so.1 => /lib64/librt.so.1 (0x00007f5ea9fbb000)
  libc.so.6 => /lib64/libc.so.6 (0x00007f5ea9c04000)
  /lib64/ld-linux-x86-64.so.2 (0x00007f5eaa3fc000)
  libdl.so.2 => /lib64/libdl.so.2 (0x00007f5ea9a00000)
  libpthread.so.0 => /lib64/libpthread.so.0 (0x00007f5ea97e4000)

34 files changed:
Makefile.am
src/execute.c
src/journal/journald.h
src/login/logind.h
src/login/pam-module.c
src/nspawn.c
src/shared/audit.c [new file with mode: 0644]
src/shared/audit.h [new file with mode: 0644]
src/shared/capability.c [new file with mode: 0644]
src/shared/capability.h [new file with mode: 0644]
src/shared/conf-parser.c [moved from src/conf-parser.c with 100% similarity]
src/shared/conf-parser.h [moved from src/conf-parser.h with 100% similarity]
src/shared/exit-status.c [moved from src/exit-status.c with 100% similarity]
src/shared/exit-status.h [moved from src/exit-status.h with 100% similarity]
src/shared/hashmap.c [moved from src/hashmap.c with 100% similarity]
src/shared/hashmap.h [moved from src/hashmap.h with 100% similarity]
src/shared/label.c [moved from src/label.c with 100% similarity]
src/shared/label.h [moved from src/label.h with 100% similarity]
src/shared/log.c [moved from src/log.c with 100% similarity]
src/shared/log.h [moved from src/log.h with 100% similarity]
src/shared/ratelimit.c [moved from src/ratelimit.c with 100% similarity]
src/shared/ratelimit.h [moved from src/ratelimit.h with 100% similarity]
src/shared/set.c [moved from src/set.c with 100% similarity]
src/shared/set.h [moved from src/set.h with 100% similarity]
src/shared/socket-util.c [moved from src/socket-util.c with 100% similarity]
src/shared/socket-util.h [moved from src/socket-util.h with 100% similarity]
src/shared/strv.c [moved from src/strv.c with 100% similarity]
src/shared/strv.h [moved from src/strv.h with 100% similarity]
src/shared/utf8.c [moved from src/utf8.c with 100% similarity]
src/shared/utf8.h [moved from src/utf8.h with 100% similarity]
src/shared/util.c [moved from src/util.c with 97% similarity]
src/shared/util.h [moved from src/util.h with 98% similarity]
src/shared/virt.c [moved from src/virt.c with 100% similarity]
src/shared/virt.h [moved from src/virt.h with 100% similarity]

index 8f56d25..357002b 100644 (file)
@@ -120,6 +120,7 @@ AM_CPPFLAGS = \
        -DX_SERVER=\"$(bindir)/X\" \
        -DUDEVLIBEXECDIR=\""$(libexecdir)/udev"\" \
        -I $(top_srcdir)/src \
+       -I $(top_srcdir)/src/shared \
        -I $(top_srcdir)/src/readahead \
        -I $(top_srcdir)/src/login \
        -I $(top_srcdir)/src/journal \
@@ -129,6 +130,7 @@ AM_CPPFLAGS = \
 AM_CFLAGS = $(WARNINGFLAGS)
 AM_LDFLAGS = $(GCLDFLAGS)
 
+# ------------------------------------------------------------------------------
 if TARGET_GENTOO
 AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
@@ -183,6 +185,7 @@ endif
 endif
 endif
 
+# ------------------------------------------------------------------------------
 rootbin_PROGRAMS = \
        systemctl \
        systemd-notify \
@@ -472,42 +475,66 @@ EXTRA_DIST += \
 
 noinst_LTLIBRARIES = \
        libsystemd-basic.la \
+       libsystemd-capability.la \
+       libsystemd-audit.la \
        libsystemd-core.la
 
+# ------------------------------------------------------------------------------
 libsystemd_basic_la_SOURCES = \
-       src/util.c \
-       src/util.h \
-       src/virt.c \
-       src/virt.h \
-       src/label.c \
-       src/label.h \
-       src/hashmap.c \
-       src/hashmap.h \
-       src/set.c \
-       src/set.h \
-       src/strv.c \
-       src/strv.h \
-       src/conf-parser.c \
-       src/conf-parser.h \
-       src/socket-util.c \
-       src/socket-util.h \
-       src/log.c \
-       src/log.h \
-       src/ratelimit.h \
-       src/ratelimit.c \
-       src/exit-status.c \
-       src/exit-status.h \
-       src/utf8.c \
-       src/utf8.h
+       src/shared/util.c \
+       src/shared/util.h \
+       src/shared/virt.c \
+       src/shared/virt.h \
+       src/shared/label.c \
+       src/shared/label.h \
+       src/shared/hashmap.c \
+       src/shared/hashmap.h \
+       src/shared/set.c \
+       src/shared/set.h \
+       src/shared/strv.c \
+       src/shared/strv.h \
+       src/shared/conf-parser.c \
+       src/shared/conf-parser.h \
+       src/shared/socket-util.c \
+       src/shared/socket-util.h \
+       src/shared/log.c \
+       src/shared/log.h \
+       src/shared/ratelimit.h \
+       src/shared/ratelimit.c \
+       src/shared/exit-status.c \
+       src/shared/exit-status.h \
+       src/shared/utf8.c \
+       src/shared/utf8.h
 
 libsystemd_basic_la_CFLAGS = \
        $(AM_CFLAGS) \
        $(SELINUX_CFLAGS)
 
 libsystemd_basic_la_LIBADD = \
-       $(SELINUX_LIBS) \
+       libsystemd-capability.la \
+       $(SELINUX_LIBS)
+
+# ------------------------------------------------------------------------------
+libsystemd_capability_la_SOURCES = \
+       src/shared/capability.c \
+       src/shared/capability.h
+
+libsystemd_capability_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(CAP_CFLAGS)
+
+libsystemd_capability_la_LIBADD = \
        $(CAP_LIBS)
 
+# ------------------------------------------------------------------------------
+libsystemd_audit_la_SOURCES = \
+       src/shared/audit.c \
+       src/shared/audit.h
+
+libsystemd_audit_la_LIBADD = \
+       libsystemd-capability.la
+
+# ------------------------------------------------------------------------------
 libsystemd_core_la_SOURCES = \
        src/unit.c \
        src/unit.h \
@@ -613,8 +640,8 @@ libsystemd_core_la_SOURCES = \
        src/tcpwrap.h \
        src/cgroup-attr.c \
        src/cgroup-attr.h \
-        src/watchdog.c \
-        src/watchdog.h \
+       src/watchdog.c \
+       src/watchdog.h \
        src/sd-daemon.c \
        src/sd-id128.c \
        src/macro.h \
@@ -667,6 +694,7 @@ libsystemd_core_la_LIBADD = \
        $(CAP_LIBS) \
        $(KMOD_LIBS)
 
+# ------------------------------------------------------------------------------
 MANPAGES = \
        man/systemd.1 \
        man/systemctl.1 \
@@ -741,6 +769,7 @@ EXTRA_DIST += \
        $(MANPAGES) \
        $(MANPAGES_ALIAS)
 
+# ------------------------------------------------------------------------------
 systemd_SOURCES = \
        src/main.c
 
@@ -751,6 +780,7 @@ systemd_CFLAGS = \
 systemd_LDADD = \
        libsystemd-core.la
 
+# ------------------------------------------------------------------------------
 test_engine_SOURCES = \
        src/test-engine.c
 
@@ -831,6 +861,7 @@ test_watchdog_SOURCES = \
 test_watchdog_LDADD = \
        libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_initctl_SOURCES = \
        src/initctl.c \
        src/dbus-common.c
@@ -844,6 +875,7 @@ systemd_initctl_LDADD = \
        libsystemd-daemon.la \
        $(DBUS_LIBS)
 
+# ------------------------------------------------------------------------------
 systemd_update_utmp_SOURCES = \
        src/update-utmp.c \
        src/dbus-common.c \
@@ -859,6 +891,7 @@ systemd_update_utmp_LDADD = \
        $(DBUS_LIBS) \
        $(AUDIT_LIBS)
 
+# ------------------------------------------------------------------------------
 systemd_shutdownd_SOURCES = \
        src/utmp-wtmp.c \
        src/shutdownd.c
@@ -881,6 +914,7 @@ systemd_shutdown_LDADD = \
        libsystemd-basic.la \
        libudev.la
 
+# ------------------------------------------------------------------------------
 systemd_modules_load_SOURCES = \
        src/modules-load.c
 
@@ -891,12 +925,14 @@ systemd_modules_load_LDADD = \
        libsystemd-basic.la \
        $(KMOD_LIBS)
 
+# ------------------------------------------------------------------------------
 systemd_tmpfiles_SOURCES = \
        src/tmpfiles.c
 
 systemd_tmpfiles_LDADD = \
        libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
        src/machine-id-setup.c \
        src/machine-id-main.c \
@@ -905,12 +941,14 @@ systemd_machine_id_setup_SOURCES = \
 systemd_machine_id_setup_LDADD = \
        libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_sysctl_SOURCES = \
        src/sysctl.c
 
 systemd_sysctl_LDADD = \
        libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_fsck_SOURCES = \
        src/fsck.c \
        src/dbus-common.c
@@ -924,12 +962,14 @@ systemd_fsck_LDADD = \
        libudev.la \
        $(DBUS_LIBS)
 
+# ------------------------------------------------------------------------------
 systemd_timestamp_SOURCES = \
        src/timestamp.c
 
 systemd_timestamp_LDADD = \
        libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_ac_power_SOURCES = \
        src/ac-power.c
 
@@ -937,12 +977,14 @@ systemd_ac_power_LDADD = \
        libsystemd-basic.la \
        libudev.la
 
+# ------------------------------------------------------------------------------
 systemd_detect_virt_SOURCES = \
        src/detect-virt.c
 
 systemd_detect_virt_LDADD = \
        libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_getty_generator_SOURCES = \
        src/getty-generator.c \
        src/unit-name.c
@@ -950,20 +992,22 @@ systemd_getty_generator_SOURCES = \
 systemd_getty_generator_LDADD = \
        libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_rc_local_generator_SOURCES = \
        src/rc-local-generator.c
 
 systemd_rc_local_generator_LDADD = \
        libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_remount_api_vfs_SOURCES = \
        src/remount-api-vfs.c \
-       src/mount-setup.c \
-       src/exit-status.c
+       src/mount-setup.c
 
 systemd_remount_api_vfs_LDADD = \
        libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_cgroups_agent_SOURCES = \
        src/cgroups-agent.c \
        src/dbus-common.c
@@ -976,6 +1020,7 @@ systemd_cgroups_agent_LDADD = \
        libsystemd-basic.la \
        $(DBUS_LIBS)
 
+# ------------------------------------------------------------------------------
 systemctl_SOURCES = \
        src/systemctl.c \
        src/utmp-wtmp.c \
@@ -983,7 +1028,6 @@ systemctl_SOURCES = \
        src/path-lookup.c \
        src/cgroup-show.c \
        src/cgroup-util.c \
-       src/exit-status.c \
        src/unit-name.c \
        src/pager.c \
        src/install.c \
@@ -1001,6 +1045,7 @@ systemctl_LDADD = \
        libsystemd-id128.la \
        $(DBUS_LIBS)
 
+# ------------------------------------------------------------------------------
 systemd_notify_SOURCES = \
        src/notify.c \
        src/readahead/sd-readahead.c
@@ -1009,6 +1054,7 @@ systemd_notify_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la
 
+# ------------------------------------------------------------------------------
 systemd_ask_password_SOURCES = \
        src/ask-password.c \
        src/ask-password-api.c
@@ -1016,12 +1062,14 @@ systemd_ask_password_SOURCES = \
 systemd_ask_password_LDADD = \
        libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_reply_password_SOURCES = \
        src/reply-password.c
 
 systemd_reply_password_LDADD = \
        libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_cgls_SOURCES = \
        src/cgls.c \
        src/cgroup-show.c \
@@ -1031,6 +1079,7 @@ systemd_cgls_SOURCES = \
 systemd_cgls_LDADD = \
        libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_cgtop_SOURCES = \
        src/cgtop.c \
         src/cgroup-util.c
@@ -1038,6 +1087,7 @@ systemd_cgtop_SOURCES = \
 systemd_cgtop_LDADD = \
        libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_nspawn_SOURCES = \
        src/nspawn.c \
        src/cgroup-util.c \
@@ -1045,14 +1095,17 @@ systemd_nspawn_SOURCES = \
 
 systemd_nspawn_LDADD = \
        libsystemd-basic.la \
+       libsystemd-capability.la \
        libsystemd-daemon.la
 
+# ------------------------------------------------------------------------------
 systemd_stdio_bridge_SOURCES = \
        src/bridge.c
 
 systemd_stdio_bridge_LDADD = \
        libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
        src/tty-ask-password-agent.c \
        src/ask-password-api.c \
@@ -1844,6 +1897,7 @@ systemd_journald_CFLAGS = \
 
 systemd_journald_LDADD = \
        libsystemd-basic.la \
+       libsystemd-audit.la \
        libsystemd-daemon.la \
        libsystemd-login.la \
        $(ACL_LIBS)
@@ -2452,6 +2506,7 @@ systemd_logind_CFLAGS = \
 
 systemd_logind_LDADD = \
        libsystemd-basic.la \
+       libsystemd-audit.la \
        libsystemd-daemon.la \
        libudev.la \
        $(DBUS_LIBS) \
index dab4856..179ca7e 100644 (file)
@@ -45,6 +45,7 @@
 #include "execute.h"
 #include "strv.h"
 #include "macro.h"
+#include "capability.h"
 #include "util.h"
 #include "log.h"
 #include "ioprio.h"
index 6160991..7840fd5 100644 (file)
@@ -29,6 +29,7 @@
 #include "journal-file.h"
 #include "hashmap.h"
 #include "util.h"
+#include "audit.h"
 #include "journal-rate-limit.h"
 #include "list.h"
 
index a4b4602..9586793 100644 (file)
@@ -28,6 +28,7 @@
 #include <libudev.h>
 
 #include "util.h"
+#include "audit.h"
 #include "list.h"
 #include "hashmap.h"
 #include "cgroup-util.h"
index 4106d2b..1edb91c 100644 (file)
@@ -35,6 +35,7 @@
 #include <systemd/sd-daemon.h>
 
 #include "util.h"
+#include "audit.h"
 #include "macro.h"
 #include "strv.h"
 #include "dbus-common.h"
index 6f5a9d9..66910bc 100644 (file)
@@ -43,6 +43,7 @@
 
 #include "log.h"
 #include "util.h"
+#include "audit.h"
 #include "missing.h"
 #include "cgroup-util.h"
 #include "strv.h"
diff --git a/src/shared/audit.c b/src/shared/audit.c
new file mode 100644 (file)
index 0000000..3850059
--- /dev/null
@@ -0,0 +1,118 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd 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 2 of the License, or
+  (at your option) any later version.
+
+  systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <assert.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <sys/prctl.h>
+#include <sys/capability.h>
+
+#include "macro.h"
+#include "audit.h"
+#include "util.h"
+#include "log.h"
+
+int audit_session_from_pid(pid_t pid, uint32_t *id) {
+        char *s;
+        uint32_t u;
+        int r;
+
+        assert(id);
+
+        if (have_effective_cap(CAP_AUDIT_CONTROL) <= 0)
+                return -ENOENT;
+
+        if (pid == 0)
+                r = read_one_line_file("/proc/self/sessionid", &s);
+        else {
+                char *p;
+
+                if (asprintf(&p, "/proc/%lu/sessionid", (unsigned long) pid) < 0)
+                        return -ENOMEM;
+
+                r = read_one_line_file(p, &s);
+                free(p);
+        }
+
+        if (r < 0)
+                return r;
+
+        r = safe_atou32(s, &u);
+        free(s);
+
+        if (r < 0)
+                return r;
+
+        if (u == (uint32_t) -1 || u <= 0)
+                return -ENOENT;
+
+        *id = u;
+        return 0;
+}
+
+int audit_loginuid_from_pid(pid_t pid, uid_t *uid) {
+        char *s;
+        uid_t u;
+        int r;
+
+        assert(uid);
+
+        /* Only use audit login uid if we are executed with sufficient
+         * capabilities so that pam_loginuid could do its job. If we
+         * are lacking the CAP_AUDIT_CONTROL capabality we most likely
+         * are being run in a container and /proc/self/loginuid is
+         * useless since it probably contains a uid of the host
+         * system. */
+
+        if (have_effective_cap(CAP_AUDIT_CONTROL) <= 0)
+                return -ENOENT;
+
+        if (pid == 0)
+                r = read_one_line_file("/proc/self/loginuid", &s);
+        else {
+                char *p;
+
+                if (asprintf(&p, "/proc/%lu/loginuid", (unsigned long) pid) < 0)
+                        return -ENOMEM;
+
+                r = read_one_line_file(p, &s);
+                free(p);
+        }
+
+        if (r < 0)
+                return r;
+
+        r = parse_uid(s, &u);
+        free(s);
+
+        if (r < 0)
+                return r;
+
+        if (u == (uid_t) -1)
+                return -ENOENT;
+
+        *uid = (uid_t) u;
+        return 0;
+}
diff --git a/src/shared/audit.h b/src/shared/audit.h
new file mode 100644 (file)
index 0000000..3529046
--- /dev/null
@@ -0,0 +1,29 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#ifndef fooaudithfoo
+#define fooaudithfoo
+
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd 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 2 of the License, or
+  (at your option) any later version.
+
+  systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include "capability.h"
+
+int audit_session_from_pid(pid_t pid, uint32_t *id);
+int audit_loginuid_from_pid(pid_t pid, uid_t *uid);
+#endif
diff --git a/src/shared/capability.c b/src/shared/capability.c
new file mode 100644 (file)
index 0000000..b800215
--- /dev/null
@@ -0,0 +1,86 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd 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 2 of the License, or
+  (at your option) any later version.
+
+  systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <assert.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <stdarg.h>
+#include <ctype.h>
+#include <sys/capability.h>
+#include <sys/prctl.h>
+
+#include "macro.h"
+#include "capability.h"
+#include "util.h"
+#include "log.h"
+
+int have_effective_cap(int value) {
+        cap_t cap;
+        cap_flag_value_t fv;
+        int r;
+
+        if (!(cap = cap_get_proc()))
+                return -errno;
+
+        if (cap_get_flag(cap, value, CAP_EFFECTIVE, &fv) < 0)
+                r = -errno;
+        else
+                r = fv == CAP_SET;
+
+        cap_free(cap);
+        return r;
+}
+
+unsigned long cap_last_cap(void) {
+        static __thread unsigned long saved;
+        static __thread bool valid = false;
+        unsigned long p;
+
+        if (valid)
+                return saved;
+
+        p = (unsigned long) CAP_LAST_CAP;
+
+        if (prctl(PR_CAPBSET_READ, p) < 0) {
+
+                /* Hmm, look downwards, until we find one that
+                 * works */
+                for (p--; p > 0; p --)
+                        if (prctl(PR_CAPBSET_READ, p) >= 0)
+                                break;
+
+        } else {
+
+                /* Hmm, look upwards, until we find one that doesn't
+                 * work */
+                for (;; p++)
+                        if (prctl(PR_CAPBSET_READ, p+1) < 0)
+                                break;
+        }
+
+        saved = p;
+        valid = true;
+
+        return p;
+}
diff --git a/src/shared/capability.h b/src/shared/capability.h
new file mode 100644 (file)
index 0000000..ab7e40b
--- /dev/null
@@ -0,0 +1,27 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#ifndef foocapabilityhfoo
+#define foocapabilityhfoo
+
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd 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 2 of the License, or
+  (at your option) any later version.
+
+  systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+unsigned long cap_last_cap(void);
+int have_effective_cap(int value);
+#endif
similarity index 100%
rename from src/conf-parser.c
rename to src/shared/conf-parser.c
similarity index 100%
rename from src/conf-parser.h
rename to src/shared/conf-parser.h
similarity index 100%
rename from src/exit-status.c
rename to src/shared/exit-status.c
similarity index 100%
rename from src/exit-status.h
rename to src/shared/exit-status.h
similarity index 100%
rename from src/hashmap.c
rename to src/shared/hashmap.c
similarity index 100%
rename from src/hashmap.h
rename to src/shared/hashmap.h
similarity index 100%
rename from src/label.c
rename to src/shared/label.c
similarity index 100%
rename from src/label.h
rename to src/shared/label.h
similarity index 100%
rename from src/log.c
rename to src/shared/log.c
similarity index 100%
rename from src/log.h
rename to src/shared/log.h
similarity index 100%
rename from src/ratelimit.c
rename to src/shared/ratelimit.c
similarity index 100%
rename from src/ratelimit.h
rename to src/shared/ratelimit.h
similarity index 100%
rename from src/set.c
rename to src/shared/set.c
similarity index 100%
rename from src/set.h
rename to src/shared/set.h
similarity index 100%
rename from src/socket-util.c
rename to src/shared/socket-util.c
similarity index 100%
rename from src/socket-util.h
rename to src/shared/socket-util.h
similarity index 100%
rename from src/strv.c
rename to src/shared/strv.c
similarity index 100%
rename from src/strv.h
rename to src/shared/strv.h
similarity index 100%
rename from src/utf8.c
rename to src/shared/utf8.c
similarity index 100%
rename from src/utf8.h
rename to src/shared/utf8.h
similarity index 97%
rename from src/util.c
rename to src/shared/util.c
index dfc1dc6..563853f 100644 (file)
@@ -4716,23 +4716,6 @@ void skip_syslog_date(char **buf) {
         *buf = p;
 }
 
-int have_effective_cap(int value) {
-        cap_t cap;
-        cap_flag_value_t fv;
-        int r;
-
-        if (!(cap = cap_get_proc()))
-                return -errno;
-
-        if (cap_get_flag(cap, value, CAP_EFFECTIVE, &fv) < 0)
-                r = -errno;
-        else
-                r = fv == CAP_SET;
-
-        cap_free(cap);
-        return r;
-}
-
 char* strshorten(char *s, size_t l) {
         assert(s);
 
@@ -5399,89 +5382,6 @@ int symlink_or_copy_atomic(const char *from, const char *to) {
         return r;
 }
 
-int audit_session_from_pid(pid_t pid, uint32_t *id) {
-        char *s;
-        uint32_t u;
-        int r;
-
-        assert(id);
-
-        if (have_effective_cap(CAP_AUDIT_CONTROL) <= 0)
-                return -ENOENT;
-
-        if (pid == 0)
-                r = read_one_line_file("/proc/self/sessionid", &s);
-        else {
-                char *p;
-
-                if (asprintf(&p, "/proc/%lu/sessionid", (unsigned long) pid) < 0)
-                        return -ENOMEM;
-
-                r = read_one_line_file(p, &s);
-                free(p);
-        }
-
-        if (r < 0)
-                return r;
-
-        r = safe_atou32(s, &u);
-        free(s);
-
-        if (r < 0)
-                return r;
-
-        if (u == (uint32_t) -1 || u <= 0)
-                return -ENOENT;
-
-        *id = u;
-        return 0;
-}
-
-int audit_loginuid_from_pid(pid_t pid, uid_t *uid) {
-        char *s;
-        uid_t u;
-        int r;
-
-        assert(uid);
-
-        /* Only use audit login uid if we are executed with sufficient
-         * capabilities so that pam_loginuid could do its job. If we
-         * are lacking the CAP_AUDIT_CONTROL capabality we most likely
-         * are being run in a container and /proc/self/loginuid is
-         * useless since it probably contains a uid of the host
-         * system. */
-
-        if (have_effective_cap(CAP_AUDIT_CONTROL) <= 0)
-                return -ENOENT;
-
-        if (pid == 0)
-                r = read_one_line_file("/proc/self/loginuid", &s);
-        else {
-                char *p;
-
-                if (asprintf(&p, "/proc/%lu/loginuid", (unsigned long) pid) < 0)
-                        return -ENOMEM;
-
-                r = read_one_line_file(p, &s);
-                free(p);
-        }
-
-        if (r < 0)
-                return r;
-
-        r = parse_uid(s, &u);
-        free(s);
-
-        if (r < 0)
-                return r;
-
-        if (u == (uid_t) -1)
-                return -ENOENT;
-
-        *uid = (uid_t) u;
-        return 0;
-}
-
 bool display_is_local(const char *display) {
         assert(display);
 
@@ -6137,39 +6037,6 @@ int prot_from_flags(int flags) {
         }
 }
 
-unsigned long cap_last_cap(void) {
-        static __thread unsigned long saved;
-        static __thread bool valid = false;
-        unsigned long p;
-
-        if (valid)
-                return saved;
-
-        p = (unsigned long) CAP_LAST_CAP;
-
-        if (prctl(PR_CAPBSET_READ, p) < 0) {
-
-                /* Hmm, look downwards, until we find one that
-                 * works */
-                for (p--; p > 0; p --)
-                        if (prctl(PR_CAPBSET_READ, p) >= 0)
-                                break;
-
-        } else {
-
-                /* Hmm, look upwards, until we find one that doesn't
-                 * work */
-                for (;; p++)
-                        if (prctl(PR_CAPBSET_READ, p+1) < 0)
-                                break;
-        }
-
-        saved = p;
-        valid = true;
-
-        return p;
-}
-
 char *format_bytes(char *buf, size_t l, off_t t) {
         unsigned i;
 
similarity index 98%
rename from src/util.h
rename to src/shared/util.h
index b1af6db..e96d56d 100644 (file)
@@ -431,8 +431,6 @@ void parse_syslog_priority(char **p, int *priority);
 void skip_syslog_pid(char **buf);
 void skip_syslog_date(char **buf);
 
-int have_effective_cap(int value);
-
 bool hostname_is_valid(const char *s);
 char* hostname_cleanup(char *s);
 
@@ -457,9 +455,6 @@ int hwclock_reset_localtime_delta(void);
 int hwclock_get_time(struct tm *tm);
 int hwclock_set_time(const struct tm *tm);
 
-int audit_session_from_pid(pid_t pid, uint32_t *id);
-int audit_loginuid_from_pid(pid_t pid, uid_t *uid);
-
 bool display_is_local(const char *display);
 int socket_from_display(const char *display, char **path);
 
@@ -526,8 +521,6 @@ bool kexec_loaded(void);
 
 int prot_from_flags(int flags);
 
-unsigned long cap_last_cap(void);
-
 char *format_bytes(char *buf, size_t l, off_t t);
 
 int fd_wait_for_event(int fd, int event, usec_t timeout);
@@ -540,5 +533,4 @@ int is_kernel_thread(pid_t pid);
 
 int fd_inc_sndbuf(int fd, size_t n);
 int fd_inc_rcvbuf(int fd, size_t n);
-
 #endif
similarity index 100%
rename from src/virt.c
rename to src/shared/virt.c
similarity index 100%
rename from src/virt.h
rename to src/shared/virt.h