diff options
Diffstat (limited to 'src')
36 files changed, 159 insertions, 129 deletions
diff --git a/src/basic/build.h b/src/basic/build.h index 334383bdf..379459f3d 100644 --- a/src/basic/build.h +++ b/src/basic/build.h @@ -19,37 +19,37 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#ifdef HAVE_PAM +#if HAVE_PAM #define _PAM_FEATURE_ "+PAM" #else #define _PAM_FEATURE_ "-PAM" #endif -#ifdef HAVE_AUDIT +#if HAVE_AUDIT #define _AUDIT_FEATURE_ "+AUDIT" #else #define _AUDIT_FEATURE_ "-AUDIT" #endif -#ifdef HAVE_SELINUX +#if HAVE_SELINUX #define _SELINUX_FEATURE_ "+SELINUX" #else #define _SELINUX_FEATURE_ "-SELINUX" #endif -#ifdef HAVE_SMACK +#if HAVE_SMACK #define _SMACK_FEATURE_ "+SMACK" #else #define _SMACK_FEATURE_ "-SMACK" #endif -#ifdef HAVE_UTMP +#if HAVE_UTMP #define _UTMP_FEATURE_ "+UTMP" #else #define _UTMP_FEATURE_ "-UTMP" #endif -#ifdef HAVE_ACL +#if HAVE_ACL #define _ACL_FEATURE_ "+ACL" #else #define _ACL_FEATURE_ "-ACL" diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c index 294dcc8d4..66324021a 100644 --- a/src/basic/capability-util.c +++ b/src/basic/capability-util.c @@ -31,6 +31,7 @@ #include "log.h" #include "macro.h" #include "parse-util.h" +#include "user-util.h" #include "util.h" #if 0 /// UNNEEDED by elogind diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index 630ae23a0..8136e62b4 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -153,7 +153,7 @@ bool cg_ns_supported(void) { return enabled; } -#endif //0 +#endif // 0 int cg_enumerate_subgroups(const char *controller, const char *path, DIR **_d) { _cleanup_free_ char *fs = NULL; @@ -1037,7 +1037,7 @@ int cg_get_xattr(const char *controller, const char *path, const char *name, voi int cg_pid_get_path(const char *controller, pid_t pid, char **path) { _cleanup_fclose_ FILE *f = NULL; char line[LINE_MAX]; - const char *fs, *controller_str = NULL; + const char *fs, *controller_str; size_t cs = 0; int unified; diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h index 2fa377414..1f1a33873 100644 --- a/src/basic/cgroup-util.h +++ b/src/basic/cgroup-util.h @@ -23,6 +23,7 @@ #include <stdbool.h> #include <stdint.h> #include <stdio.h> +#include <sys/statfs.h> #include <sys/types.h> #include "def.h" diff --git a/src/basic/copy.c b/src/basic/copy.c index 37212be22..6827290e2 100644 --- a/src/basic/copy.c +++ b/src/basic/copy.c @@ -40,10 +40,12 @@ //#include "fs-util.h" #include "io-util.h" //#include "macro.h" +#include "missing.h" //#include "string-util.h" #include "strv.h" #include "time-util.h" //#include "umask-util.h" +#include "user-util.h" //#include "xattr-util.h" #define COPY_BUFFER_SIZE (16*1024u) diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c index d12b5036b..565902c7b 100644 --- a/src/basic/fd-util.c +++ b/src/basic/fd-util.c @@ -26,11 +26,14 @@ #include "dirent-util.h" #include "fd-util.h" +#include "fs-util.h" #include "macro.h" #include "missing.h" #include "parse-util.h" #include "path-util.h" +#include "process-util.h" #include "socket-util.h" +#include "stdio-util.h" #include "util.h" int close_nointr(int fd) { diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h index a9ec7611d..f30b69550 100644 --- a/src/basic/fs-util.h +++ b/src/basic/fs-util.h @@ -58,8 +58,7 @@ int fd_warn_permissions(const char *path, int fd); #define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW) #else #define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), 0) -#endif - +#endif // __GLIBC__ int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); int touch(const char *path); diff --git a/src/basic/generate-cap-list.sh b/src/basic/generate-cap-list.sh index 0678bb5a3..4019d7092 100755 --- a/src/basic/generate-cap-list.sh +++ b/src/basic/generate-cap-list.sh @@ -1,5 +1,11 @@ #!/bin/sh -eu +#if 0 /// elogind needs musl_missing.sh, which is in shared. +# $1 -dM -include linux/capability.h -include "$2" -include "$3" - </dev/null | \ +# awk '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $2; }' | \ +# grep -v CAP_LAST_CAP +#else $1 -dM -include linux/capability.h -I../src/shared -include "$2" -include "$3" - </dev/null | \ awk '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $2; }' | \ grep -v CAP_LAST_CAP +#endif // 0 diff --git a/src/basic/log.h b/src/basic/log.h index 5633a2b42..c4d089b19 100644 --- a/src/basic/log.h +++ b/src/basic/log.h @@ -30,6 +30,7 @@ #include "sd-id128.h" #include "macro.h" +#include "process-util.h" typedef enum LogRealm { LOG_REALM_SYSTEMD, diff --git a/src/basic/meson.build b/src/basic/meson.build index c1712f2db..fd7bbd781 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -351,7 +351,7 @@ generate_gperfs = find_program('generate-gperfs.py') # output : 'af-list.txt', # command : [generate_af_list, cpp], # capture : true) -# + # generate_arphrd_list = find_program('generate-arphrd-list.sh') # arphrd_list_txt = custom_target( # 'arphrd-list.txt', diff --git a/src/basic/mount-util.c b/src/basic/mount-util.c index 98ef9f99f..e65cd67dc 100644 --- a/src/basic/mount-util.c +++ b/src/basic/mount-util.c @@ -37,6 +37,7 @@ #include "set.h" #include "stdio-util.h" #include "string-util.h" +#include "strv.h" static int fd_fdinfo_mnt_id(int fd, const char *filename, int flags, int *mnt_id) { char path[strlen("/proc/self/fdinfo/") + DECIMAL_STR_MAX(int)]; diff --git a/src/basic/path-util.c b/src/basic/path-util.c index 280beae22..9ee0547fc 100644 --- a/src/basic/path-util.c +++ b/src/basic/path-util.c @@ -34,9 +34,11 @@ #include "alloc-util.h" #include "extract-word.h" #include "fs-util.h" +#include "glob-util.h" #include "log.h" #include "macro.h" #include "missing.h" +#include "parse-util.h" #include "path-util.h" #include "stat-util.h" #include "string-util.h" diff --git a/src/basic/set.h b/src/basic/set.h index e21e4220b..08b7c4a72 100644 --- a/src/basic/set.h +++ b/src/basic/set.h @@ -19,6 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#include "extract-word.h" #include "hashmap.h" #include "macro.h" diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c index 3d622bb1c..ef3c59172 100644 --- a/src/basic/socket-util.c +++ b/src/basic/socket-util.c @@ -23,6 +23,7 @@ #include <net/if.h> #include <netdb.h> #include <netinet/ip.h> +#include <poll.h> #include <stddef.h> #include <stdint.h> #include <stdio.h> diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c index 064f0b477..0c8c301b6 100644 --- a/src/basic/stat-util.c +++ b/src/basic/stat-util.c @@ -28,6 +28,7 @@ #include "dirent-util.h" #include "fd-util.h" +#include "fs-util.h" #include "macro.h" #include "missing.h" #include "stat-util.h" diff --git a/src/basic/time-util.c b/src/basic/time-util.c index fc94c945e..07fc5a444 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -21,6 +21,7 @@ #include <limits.h> #include <stdlib.h> #include <string.h> +#include <sys/mman.h> #include <sys/stat.h> #include <sys/time.h> #include <sys/timerfd.h> diff --git a/src/basic/util.c b/src/basic/util.c index 3dfe1ff65..8358d3c08 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -18,7 +18,6 @@ ***/ #include <alloca.h> -//#include <dirent.h> //#include <errno.h> //#include <fcntl.h> #include <sched.h> @@ -35,13 +34,14 @@ //#include <unistd.h> #include "alloc-util.h" +//#include "btrfs-util.h" #include "build.h" #include "cgroup-util.h" //#include "def.h" #include "dirent-util.h" #include "fd-util.h" #include "fileio.h" -//#include "formats-util.h" +//#include "format-util.h" #include "hashmap.h" #include "hostname-util.h" //#include "log.h" diff --git a/src/basic/virt.c b/src/basic/virt.c index 36bfd2429..8df839243 100644 --- a/src/basic/virt.c +++ b/src/basic/virt.c @@ -25,6 +25,7 @@ #include "alloc-util.h" #include "dirent-util.h" +#include "env-util.h" #include "fd-util.h" #include "fileio.h" #include "macro.h" diff --git a/src/core/cgroup.c b/src/core/cgroup.c index c0f07ca9a..6e200ccb6 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -21,6 +21,7 @@ #include <fnmatch.h> #include "alloc-util.h" +#include "bpf-firewall.h" #include "cgroup-util.h" #include "cgroup.h" #include "fd-util.h" diff --git a/src/core/cgroup.h b/src/core/cgroup.h index af906db21..dc4b4cadf 100644 --- a/src/core/cgroup.h +++ b/src/core/cgroup.h @@ -24,6 +24,7 @@ //#include "list.h" //#include "time-util.h" #include "cgroup-util.h" +#include "ip-address-access.h" #if 0 /// UNNEEDED by elogind typedef struct CGroupContext CGroupContext; diff --git a/src/core/meson.build b/src/core/meson.build index 482d1f09b..e58312d81 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -133,13 +133,13 @@ libcore_la_sources = files(''' # output: 'load-fragment-gperf.gperf', # command : [m4, '-P'] + m4_defines + ['@INPUT@'], # capture : true) -# + # load_fragment_gperf_c = custom_target( # 'load-fragment-gperf.c', # input : load_fragment_gperf_gperf, # output : 'load-fragment-gperf.c', # command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) -# + # awkscript = 'load-fragment-gperf-nulstr.awk' # load_fragment_gperf_nulstr_c = custom_target( # 'load-fragment-gperf-nulstr.c', @@ -147,7 +147,7 @@ libcore_la_sources = files(''' # output : 'load-fragment-gperf-nulstr.c', # command : [awk, '-f', '@INPUT0@', '@INPUT1@'], # capture : true) -# + # libcore = static_library( # 'core', # libcore_la_sources, @@ -162,9 +162,9 @@ libcore_la_sources = files(''' # libkmod, # libapparmor, # libmount]) -# + # systemd_sources = files('main.c') -# + # systemd_shutdown_sources = files(''' # shutdown.c # umount.c @@ -174,15 +174,15 @@ libcore_la_sources = files(''' # killall.c # killall.h # '''.split()) -# + # in_files = [['macros.systemd', rpmmacrosdir], # ['triggers.systemd', ''], # ['systemd.pc', pkgconfigdatadir]] -# + # foreach item : in_files # file = item[0] # dir = item[1] -# + # # If 'no', disable generation completely. # # If '', generate, but do not install. # if dir != 'no' @@ -196,17 +196,17 @@ libcore_la_sources = files(''' # endif # endif # endforeach -# + # install_data('org.freedesktop.systemd1.conf', # install_dir : dbuspolicydir) # install_data('org.freedesktop.systemd1.service', # install_dir : dbussystemservicedir) -# + # policy_in = configure_file( # input : 'org.freedesktop.systemd1.policy.in.in', # output : 'org.freedesktop.systemd1.policy.in', # configuration : substs) -# + # custom_target( # 'org.freedesktop.systemd1.policy', # input : policy_in, @@ -231,12 +231,12 @@ libcore_la_sources = files(''' # install_data('system.conf', # 'user.conf', # install_dir : pkgsysconfdir) -# + # meson.add_install_script('sh', '-c', mkdir_p.format(systemshutdowndir)) # meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir)) # meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir)) # meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir)) -# + # meson.add_install_script('sh', '-c', # mkdir_p.format(join_paths(pkgsysconfdir, 'system/multi-user.target.wants'))) # meson.add_install_script('sh', '-c', diff --git a/src/libelogind/sd-bus/bus-common-errors.h b/src/libelogind/sd-bus/bus-common-errors.h index aad97ff5c..4266ca61d 100644 --- a/src/libelogind/sd-bus/bus-common-errors.h +++ b/src/libelogind/sd-bus/bus-common-errors.h @@ -24,6 +24,7 @@ #if 0 /// only system command elogind knows are needed #define BUS_ERROR_NO_SUCH_UNIT "org.freedesktop.systemd1.NoSuchUnit" #define BUS_ERROR_NO_UNIT_FOR_PID "org.freedesktop.systemd1.NoUnitForPID" +#define BUS_ERROR_NO_UNIT_FOR_INVOCATION_ID "org.freedesktop.elogind1.NoUnitForInvocationID" #define BUS_ERROR_UNIT_EXISTS "org.freedesktop.systemd1.UnitExists" #define BUS_ERROR_LOAD_FAILED "org.freedesktop.systemd1.LoadFailed" #define BUS_ERROR_JOB_FAILED "org.freedesktop.systemd1.JobFailed" @@ -42,6 +43,9 @@ #define BUS_ERROR_SHUTTING_DOWN "org.freedesktop.systemd1.ShuttingDown" #define BUS_ERROR_SCOPE_NOT_RUNNING "org.freedesktop.systemd1.ScopeNotRunning" #endif // 0 +#define BUS_ERROR_NO_SUCH_DYNAMIC_USER "org.freedesktop.elogind1.NoSuchDynamicUser" +#define BUS_ERROR_NOT_REFERENCED "org.freedesktop.elogind1.NotReferenced" +#define BUS_ERROR_DISK_FULL "org.freedesktop.elogind1.DiskFull" #if 0 /// no machined in elogind #define BUS_ERROR_NO_SUCH_MACHINE "org.freedesktop.machine1.NoSuchMachine" diff --git a/src/libelogind/sd-id128/sd-id128.c b/src/libelogind/sd-id128/sd-id128.c index 7dc67cf83..d44d75ece 100644 --- a/src/libelogind/sd-id128/sd-id128.c +++ b/src/libelogind/sd-id128/sd-id128.c @@ -30,6 +30,7 @@ #include "io-util.h" #include "khash.h" #include "macro.h" +#include "missing.h" #include "random-util.h" #include "user-util.h" #include "util.h" diff --git a/src/login/loginctl.c b/src/login/loginctl.c index 62d68b907..dc39f8cdf 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -27,6 +27,7 @@ #include "alloc-util.h" #include "bus-error.h" +#include "bus-unit-util.h" #include "bus-util.h" //#include "cgroup-show.h" #include "cgroup-util.h" @@ -1433,9 +1434,11 @@ static int help(int argc, char *argv[], void *userdata) { " -i --ignore-inhibitors When shutting down or sleeping, ignore inhibitors\n\n" #endif // 0 "Session Commands:\n" -#if 1 /// elogind has "list" as a shorthand for "list-sessions" +#if 0 /// elogind has "list" as a shorthand for "list-sessions" + " list-sessions List sessions\n" +#else " list[-sessions] List sessions (default command)\n" -#endif // 1 +#endif // 0 " session-status [ID...] Show session status\n" " show-session [ID...] Show properties of sessions or the manager\n" " activate [ID] Activate a session\n" @@ -1459,15 +1462,17 @@ static int help(int argc, char *argv[], void *userdata) { " show-seat [NAME...] Show properties of seats or the manager\n" " attach NAME DEVICE... Attach one or more devices to a seat\n" " flush-devices Flush all device associations\n" +#if 0 /// elogind adds some system commands to loginctl + " terminate-seat NAME... Terminate all sessions on one or more seats\n" +#else " terminate-seat NAME... Terminate all sessions on one or more seats\n\n" -#if 1 /// elogind adds some system commands to loginctl "System Commands:\n" " poweroff [TIME] [WALL...] Turn off the machine\n" " reboot [TIME] [WALL...] Reboot the machine\n" " suspend Suspend the machine to memory\n" " hibernate Suspend the machine to disk\n" " hybrid-sleep Suspend the machine to memory and disk\n" -#endif // 1 +#endif // 0 , program_invocation_short_name); return 0; diff --git a/src/login/logind-core.c b/src/login/logind-core.c index 6eb1e4c93..714503228 100644 --- a/src/login/logind-core.c +++ b/src/login/logind-core.c @@ -29,6 +29,7 @@ #include "cgroup-util.h" #include "fd-util.h" #include "logind.h" +#include "parse-util.h" #include "strv.h" #include "terminal-util.h" #include "udev-util.h" diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 63cd1a4d4..8247ec494 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -52,7 +52,6 @@ /// Additional includes needed by elogind #include "elogind-dbus.h" -//#include "update-utmp.h" int manager_get_session_from_creds(Manager *m, sd_bus_message *message, const char *name, sd_bus_error *error, Session **ret) { _cleanup_(sd_bus_creds_unrefp) sd_bus_creds *creds = NULL; diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c index b46644894..b347ef52a 100644 --- a/src/login/logind-session-device.c +++ b/src/login/logind-session-device.c @@ -34,6 +34,7 @@ #include "fd-util.h" #include "logind-session-device.h" #include "missing.h" +#include "parse-util.h" #include "sd-daemon.h" #include "util.h" diff --git a/src/login/logind-session.c b/src/login/logind-session.c index 8712dae62..ff1552b8a 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -41,7 +41,6 @@ #include "mkdir.h" #include "parse-util.h" #include "path-util.h" -#include "process-util.h" #include "string-table.h" #include "terminal-util.h" #include "user-util.h" @@ -49,6 +48,7 @@ /// Additional includes needed by elogind #include "extract-word.h" +#include "process-util.h" #define RELEASE_USEC (20*USEC_PER_SEC) diff --git a/src/login/logind.c b/src/login/logind.c index 1fc636a7a..b552ad664 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -48,6 +48,7 @@ #include "label.h" #include "musl_missing.h" #include "process-util.h" +#include "cgroup-util.h" static void manager_free(Manager *m); @@ -1276,7 +1277,7 @@ int main(int argc, char *argv[]) { r = elogind_startup(argc, argv); if (r) return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; -#endif // 0 +#endif // 1 elogind_set_program_name(argv[0]); log_set_target(LOG_TARGET_AUTO); @@ -1356,7 +1357,7 @@ int main(int argc, char *argv[]) { r = manager_run(m); - log_debug("elogind stopped as pid "PID_FMT, getpid()); + log_debug("elogind stopped as pid "PID_FMT, getpid_cached()); finish: sd_notify(false, diff --git a/src/login/meson.build b/src/login/meson.build index aff6e3f2a..f8fbfbc67 100644 --- a/src/login/meson.build +++ b/src/login/meson.build @@ -96,15 +96,15 @@ loginctl_sources += files(''' # configuration : substs) # install_data(logind_conf, # install_dir : pkgsysconfdir) -# + # pam_systemd_sym = 'src/login/pam_systemd.sym' # pam_systemd_c = files('pam_systemd.c') -# + # install_data('org.freedesktop.login1.conf', # install_dir : dbuspolicydir) # install_data('org.freedesktop.login1.service', # install_dir : dbussystemservicedir) -# + # custom_target( # 'org.freedesktop.login1.policy', # input : 'org.freedesktop.login1.policy.in', @@ -112,11 +112,11 @@ loginctl_sources += files(''' # command : intltool_command, # install : install_polkit, # install_dir : polkitpolicydir) -# + # install_data('70-power-switch.rules', # '70-uaccess.rules', # install_dir : udevrulesdir) -# + # foreach file : ['71-seat.rules', # '73-seat-late.rules'] # gen = configure_file( @@ -126,7 +126,7 @@ loginctl_sources += files(''' # install_data(gen, # install_dir : udevrulesdir) # endforeach -# + # custom_target( # 'systemd-user', # input : 'systemd-user.m4', diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c index 8dff2886c..0735901e3 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c @@ -28,8 +28,10 @@ #include "alloc-util.h" #include "conf-files.h" #include "conf-parser.h" +#include "def.h" #include "extract-word.h" #include "fd-util.h" +#include "fileio.h" #include "fs-util.h" #include "log.h" #include "macro.h" @@ -37,6 +39,7 @@ #include "path-util.h" #include "process-util.h" #include "signal-util.h" +#include "socket-util.h" #include "string-util.h" #include "strv.h" #include "syslog-util.h" diff --git a/src/shared/meson.build b/src/shared/meson.build index 172f55ba7..27311b8b8 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -139,7 +139,7 @@ endif # if conf.get('HAVE_SECCOMP') == 1 # shared_sources += ['seccomp-util.c'] # endif -# + # if conf.get('HAVE_LIBIPTC') == 1 # shared_sources += ['firewall-util.c'] # endif @@ -161,7 +161,7 @@ libshared_name = 'elogind-shared-@0@'.format(meson.project_version()) # libxz, # liblz4, # libblkid] -# #else +#else libshared_deps = [threads, libacl, libcap, diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c index 3a947fcde..0d8eadc37 100644 --- a/src/shared/sleep-config.c +++ b/src/shared/sleep-config.c @@ -112,7 +112,7 @@ int parse_sleep_config(const char *verb, char ***_modes, char ***_states) { #if 1 /// Only available in this file for elogind static -#endif // 0 +#endif // 1 int can_sleep_state(char **types) { char **type; int r; @@ -144,7 +144,7 @@ int can_sleep_state(char **types) { #if 1 /// Only available in this file for elogind static -#endif // 0 +#endif // 1 int can_sleep_disk(char **types) { char **type; int r; diff --git a/src/systemd/sd-daemon.h b/src/systemd/sd-daemon.h index 83a8fe82f..959e2804c 100644 --- a/src/systemd/sd-daemon.h +++ b/src/systemd/sd-daemon.h @@ -22,6 +22,7 @@ #include <inttypes.h> #include <sys/types.h> +#include <sys/socket.h> #include "_sd-common.h" diff --git a/src/test/meson.build b/src/test/meson.build index a923d6144..d374629fa 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -46,7 +46,7 @@ tests += [ # [['src/test/test-device-nodes.c'], # [], # []], -# + # [['src/test/test-engine.c', # 'src/test/test-helper.c'], # [libcore, @@ -58,7 +58,7 @@ tests += [ # libselinux, # libmount, # libblkid]], -# + # [['src/test/test-job-type.c'], # [libcore, # libshared], @@ -68,7 +68,7 @@ tests += [ # libselinux, # libmount, # libblkid]], -# + # [['src/test/test-ns.c'], # [libcore, # libshared], @@ -79,7 +79,7 @@ tests += [ # libmount, # libblkid], # '', 'manual'], -# + # [['src/test/test-loopback.c'], # [libcore, # libshared], @@ -89,7 +89,7 @@ tests += [ # libselinux, # libmount, # libblkid]], -# + # [['src/test/test-hostname.c'], # [libcore, # libshared], @@ -100,17 +100,17 @@ tests += [ # libmount, # libblkid], # '', 'unsafe'], -# + # [['src/test/test-dns-domain.c'], # [libcore, # libelogind_network], # []], -# + # [['src/test/test-boot-timestamps.c'], # [], # [], # 'ENABLE_EFI'], -# + # [['src/test/test-unit-name.c', # 'src/test/test-helper.c'], # [libcore, @@ -121,7 +121,7 @@ tests += [ # libselinux, # libmount, # libblkid]], -# + # [['src/test/test-unit-file.c', # 'src/test/test-helper.c'], # [libcore, @@ -282,36 +282,36 @@ tests += [ # [['src/test/test-terminal-util.c'], # [], # []], -# + # [['src/test/test-path-lookup.c'], # [], # []], -# + # [['src/test/test-uid-range.c'], # [], # []], -# + # [['src/test/test-cap-list.c', # generated_gperf_headers], # [], # [libcap]], -# + # [['src/test/test-socket-util.c'], # [], # []], -# + # [['src/test/test-in-addr-util.c'], # [], # []], -# + # [['src/test/test-barrier.c'], # [], # []], -# + # [['src/test/test-tmpfiles.c'], # [], # []], -# + # [['src/test/test-namespace.c'], # [libcore, # libshared], @@ -327,26 +327,26 @@ tests += [ # [['src/test/test-install-root.c'], # [], # []], -# + # [['src/test/test-acl-util.c'], # [], # [], # 'HAVE_ACL'], -# + # [['src/test/test-seccomp.c'], # [], # [libseccomp], # 'HAVE_SECCOMP'], -# + # [['src/test/test-rlimit-util.c'], # [], # []], -# + # [['src/test/test-ask-password-api.c'], # [], # [], # '', 'manual'], -# + # [['src/test/test-dissect-image.c'], # [], # [libblkid], @@ -393,7 +393,7 @@ tests += [ # [['src/test/test-bitmap.c'], # [], # []], -# + # [['src/test/test-xml.c'], # [], # []], @@ -435,15 +435,15 @@ tests += [ # [['src/test/test-fileio.c'], # [], # []], -# + # [['src/test/test-time.c'], # [], # []], -# + # [['src/test/test-clock.c'], # [], # []], -# + # [['src/test/test-architecture.c'], # [], # []], @@ -463,13 +463,13 @@ tests += [ # [], # [], # '', 'manual'], -# -# + + # [['src/test/test-firewall-util.c'], # [libshared], # [], # 'HAVE_LIBIPTC'], -# + # [['src/test/test-netlink-manual.c'], # [], # [libkmod], @@ -484,15 +484,15 @@ tests += [ # [['src/test/test-date.c'], # [], # []], -# + # [['src/test/test-sleep.c'], # [], # []], -# + # [['src/test/test-replace-var.c'], # [], # []], -# + # [['src/test/test-calendarspec.c'], # [], # []], @@ -525,19 +525,19 @@ tests += [ # libselinux, # libmount, # libblkid]], -# + # [['src/test/test-cgroup-util.c'], # [], # []], -# + # [['src/test/test-env-util.c'], # [], # []], -# + # [['src/test/test-strbuf.c'], # [], # []], -# + # [['src/test/test-strv.c'], # [], # []], @@ -558,7 +558,7 @@ tests += [ # libselinux, # libmount, # libblkid]], -# + # [['src/test/test-execute.c', # 'src/test/test-helper.c'], # [libcore, @@ -579,17 +579,17 @@ tests += [ # [['src/test/test-strxcpyx.c'], # [], # []], -# + # [['src/test/test-install.c'], # [libcore, # libshared], # [], # '', 'manual'], -# + # [['src/test/test-watchdog.c'], # [], # []], -# + # [['src/test/test-sched-prio.c', # 'src/test/test-helper.c'], # [libcore, @@ -615,20 +615,20 @@ tests += [ # generated_gperf_headers], # [], # []], -# + # [['src/test/test-arphrd-list.c', # generated_gperf_headers], # [], # []], -# + # [['src/test/test-journal-importer.c'], # [], # []], -# + # [['src/test/test-libudev.c'], # [libshared], # []], -# + # [['src/test/test-udev.c'], # [libudev_core, # libudev_internal, @@ -670,14 +670,14 @@ tests += [ # [threads, # libxz, # liblz4]], -# + # [['src/journal/test-journal-send.c'], # [libjournal_core, # libshared], # [threads, # libxz, # liblz4]], -# + # [['src/journal/test-journal-syslog.c'], # [libjournal_core, # libshared], @@ -685,63 +685,63 @@ tests += [ # libxz, # liblz4, # libselinux]], -# + # [['src/journal/test-journal-match.c'], # [libjournal_core, # libshared], # [threads, # libxz, # liblz4]], -# + # [['src/journal/test-journal-enum.c'], # [libjournal_core, # libshared], # [threads, # libxz, # liblz4]], -# + # [['src/journal/test-journal-stream.c'], # [libjournal_core, # libshared], # [threads, # libxz, # liblz4]], -# + # [['src/journal/test-journal-flush.c'], # [libjournal_core, # libshared], # [threads, # libxz, # liblz4]], -# + # [['src/journal/test-journal-init.c'], # [libjournal_core, # libshared], # [threads, # libxz, # liblz4]], -# + # [['src/journal/test-journal-verify.c'], # [libjournal_core, # libshared], # [threads, # libxz, # liblz4]], -# + # [['src/journal/test-journal-interleaving.c'], # [libjournal_core, # libshared], # [threads, # libxz, # liblz4]], -# + # [['src/journal/test-mmap-cache.c'], # [libjournal_core, # libshared], # [threads, # libxz, # liblz4]], -# + # [['src/journal/test-catalog.c'], # [libjournal_core, # libshared], @@ -749,20 +749,20 @@ tests += [ # libxz, # liblz4], # '', '', '-DCATALOG_DIR="@0@"'.format(build_catalog_dir)], -# + # [['src/journal/test-compress.c'], # [libjournal_core, # libshared], # [liblz4, # libxz]], -# + # [['src/journal/test-compress-benchmark.c'], # [libjournal_core, # libshared], # [liblz4, # libxz], # '', 'timeout=90'], -# + # [['src/journal/test-audit-type.c'], # [libjournal_core, # libshared], @@ -792,7 +792,7 @@ tests += [ # [['src/libelogind/sd-bus/test-bus-chat.c'], # [], # [threads]], -# + # [['src/libelogind/sd-bus/test-bus-cleanup.c'], # [], # [threads, @@ -830,7 +830,7 @@ tests += [ # [libglib, # libgobject, # libgio]], -# + # [['src/libelogind/sd-bus/test-bus-creds.c'], # [], # []], @@ -841,21 +841,10 @@ tests += [ []], #if 0 /// UNNEEDED in elogind -# [['src/libelogind/sd-bus/test-bus-kernel.c'], -# [], -# []], -# -# [['src/libelogind/sd-bus/test-bus-kernel-bloom.c'], -# [], -# []], -# # [['src/libelogind/sd-bus/test-bus-benchmark.c'], # [], -# [threads]], -# -# [['src/libelogind/sd-bus/test-bus-zero-copy.c'], -# [], -# []], +# [threads], +# '', 'manual'], #endif // 0 [['src/libelogind/sd-bus/test-bus-introspect.c'], @@ -870,11 +859,11 @@ tests += [ # [['src/libelogind/sd-netlink/test-netlink.c'], # [], # []], -# + # [['src/libelogind/sd-netlink/test-local-addresses.c'], # [], # []], -# + # [['src/libelogind/sd-resolve/test-resolve.c'], # [], # [threads]], @@ -905,13 +894,13 @@ tests += [ # [libshared, # libelogind_network], # []], -# + # [['src/libelogind-network/test-sd-dhcp-lease.c', # 'src/libelogind-network/dhcp-lease-internal.h'], # [libshared, # libelogind_network], # []], -# + # [['src/libelogind-network/test-dhcp-client.c', # 'src/libelogind-network/dhcp-protocol.h', # 'src/libelogind-network/dhcp-internal.h', @@ -919,33 +908,33 @@ tests += [ # [libshared, # libelogind_network], # []], -# + # [['src/libelogind-network/test-dhcp-server.c'], # [libshared, # libelogind_network], # []], -# + # [['src/libelogind-network/test-ipv4ll.c', # 'src/libelogind-network/arp-util.h', # 'src/systemd/sd-ipv4ll.h'], # [libshared, # libelogind_network], # []], -# + # [['src/libelogind-network/test-ipv4ll-manual.c', # 'src/systemd/sd-ipv4ll.h'], # [libshared, # libelogind_network], # [], # '', 'manual'], -# + # [['src/libelogind-network/test-acd.c', # 'src/systemd/sd-ipv4acd.h'], # [libshared, # libelogind_network], # [], # '', 'manual'], -# + # [['src/libelogind-network/test-ndisc-rs.c', # 'src/libelogind-network/dhcp-identifier.h', # 'src/libelogind-network/dhcp-identifier.c', @@ -955,14 +944,14 @@ tests += [ # [libshared, # libelogind_network], # []], -# + # [['src/libelogind-network/test-ndisc-ra.c', # 'src/libelogind-network/icmp6-util.h', # 'src/systemd/sd-ndisc.h'], # [libshared, # libelogind_network], # []], -# + # [['src/libelogind-network/test-dhcp6-client.c', # 'src/libelogind-network/dhcp-identifier.h', # 'src/libelogind-network/dhcp-identifier.c', @@ -971,7 +960,7 @@ tests += [ # [libshared, # libelogind_network], # []], -# + # [['src/libelogind-network/test-lldp.c'], # [libshared, # libelogind_network], diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c index 17d12ec76..d2567f67d 100644 --- a/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c @@ -18,6 +18,8 @@ ***/ #include "conf-parser.h" +#include "fd-util.h" +#include "fileio.h" #include "log.h" #include "macro.h" #include "string-util.h" |