more

41 files changed, 278 insertions, 116 deletions

diff --git a/src/grp-login/Makefile b/src/grp-login/Makefile
index 381d653166..be6adc4880 100644
--- a/src/grp-login/Makefile
+++ b/src/grp-login/Makefile
@@ -56,60 +56,9 @@ tests += \
 	test-login-tables \
 	test-login-shared
 
-
-nodist_systemunit_DATA += \
-	units/systemd-logind.service
-
-dist_systemunit_DATA += \
-	units/user.slice
-
-dist_systemunit_DATA_busnames += \
-	units/org.freedesktop.login1.busname
-
-dist_dbussystemservice_DATA += \
-	src/login/org.freedesktop.login1.service
-
-dist_dbuspolicy_DATA += \
-	src/login/org.freedesktop.login1.conf
-
-nodist_pkgsysconf_DATA += \
-	src/login/logind.conf
-
-polkitpolicy_files += \
-	src/login/org.freedesktop.login1.policy
-
-INSTALL_DIRS += \
-	$(systemdstatedir)
-
-MULTI_USER_TARGET_WANTS += \
-	systemd-logind.service
-
-SYSTEM_UNIT_ALIASES += \
-	systemd-logind.service dbus-org.freedesktop.login1.service
-
-BUSNAMES_TARGET_WANTS += \
-	org.freedesktop.login1.busname
-
-dist_udevrules_DATA += \
-	src/login/70-uaccess.rules \
-	src/login/70-power-switch.rules
-
-nodist_udevrules_DATA += \
-	src/login/71-seat.rules \
-	src/login/73-seat-late.rules
+nested.subdirs += loginctl systemd-logind
+nested.subdirs += pam_systemd systemd-inhibit
 
 endif # ENABLE_LOGIND
 
-polkitpolicy_in_files += \
-	src/login/org.freedesktop.login1.policy.in
-
-gperf_gperf_sources += \
-	src/login/logind-gperf.gperf
-
-EXTRA_DIST += \
-	src/login/71-seat.rules.in \
-	src/login/73-seat-late.rules.in \
-	units/systemd-logind.service.in \
-	src/login/logind.conf.in
-
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-login/liblogind-core/Makefile b/src/grp-login/liblogind-core/Makefile
deleted file mode 100644
index 1575518aec..0000000000
--- a/src/grp-login/liblogind-core/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-#  -*- Mode: makefile; indent-tabs-mode: t -*-
-#
-#  This file is part of systemd.
-#
-#  Copyright 2010-2012 Lennart Poettering
-#  Copyright 2010-2012 Kay Sievers
-#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
-#  Copyright 2013 David Strauss
-#  Copyright 2016 Luke Shumaker
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 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
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public License
-#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
-include $(topsrcdir)/build-aux/Makefile.head.mk
-
-liblogind_core_la_SOURCES = \
-	src/login/logind-core.c \
-	src/login/logind-device.c \
-	src/login/logind-device.h \
-	src/login/logind-button.c \
-	src/login/logind-button.h \
-	src/login/logind-action.c \
-	src/login/logind-action.h \
-	src/login/logind-seat.c \
-	src/login/logind-seat.h \
-	src/login/logind-session.c \
-	src/login/logind-session.h \
-	src/login/logind-session-device.c \
-	src/login/logind-session-device.h \
-	src/login/logind-user.c \
-	src/login/logind-user.h \
-	src/login/logind-inhibit.c \
-	src/login/logind-inhibit.h \
-	src/login/logind-dbus.c \
-	src/login/logind-session-dbus.c \
-	src/login/logind-seat-dbus.c \
-	src/login/logind-user-dbus.c \
-	src/login/logind-utmp.c \
-	src/login/logind-acl.h
-
-liblogind_core_la_LIBADD = \
-	libshared.la
-
-ifneq ($(HAVE_ACL),)
-liblogind_core_la_SOURCES += \
-	src/login/logind-acl.c
-endif # HAVE_ACL
-
-noinst_LTLIBRARIES += \
-	liblogind-core.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-login/70-power-switch.rules b/src/grp-login/systemd-logind/70-power-switch.rules
index e2855b50f7..e2855b50f7 100644
--- a/src/grp-login/70-power-switch.rules
+++ b/src/grp-login/systemd-logind/70-power-switch.rules
diff --git a/src/grp-login/70-uaccess.rules b/src/grp-login/systemd-logind/70-uaccess.rules
index 50dcd2e275..50dcd2e275 100644
--- a/src/grp-login/70-uaccess.rules
+++ b/src/grp-login/systemd-logind/70-uaccess.rules
diff --git a/src/grp-login/71-seat.rules.in b/src/grp-login/systemd-logind/71-seat.rules.in
index de55c9a4ec..de55c9a4ec 100644
--- a/src/grp-login/71-seat.rules.in
+++ b/src/grp-login/systemd-logind/71-seat.rules.in
diff --git a/src/grp-login/73-seat-late.rules.in b/src/grp-login/systemd-logind/73-seat-late.rules.in
index 901df750fd..901df750fd 100644
--- a/src/grp-login/73-seat-late.rules.in
+++ b/src/grp-login/systemd-logind/73-seat-late.rules.in
diff --git a/src/grp-login/systemd-logind/Makefile b/src/grp-login/systemd-logind/Makefile
index 9dd5855e88..18b18a1683 100644
--- a/src/grp-login/systemd-logind/Makefile
+++ b/src/grp-login/systemd-logind/Makefile
@@ -23,7 +23,38 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+_liblogind_core_la_SOURCES = \
+	src/login/logind-core.c \
+	src/login/logind-device.c \
+	src/login/logind-device.h \
+	src/login/logind-button.c \
+	src/login/logind-button.h \
+	src/login/logind-action.c \
+	src/login/logind-action.h \
+	src/login/logind-seat.c \
+	src/login/logind-seat.h \
+	src/login/logind-session.c \
+	src/login/logind-session.h \
+	src/login/logind-session-device.c \
+	src/login/logind-session-device.h \
+	src/login/logind-user.c \
+	src/login/logind-user.h \
+	src/login/logind-inhibit.c \
+	src/login/logind-inhibit.h \
+	src/login/logind-dbus.c \
+	src/login/logind-session-dbus.c \
+	src/login/logind-seat-dbus.c \
+	src/login/logind-user-dbus.c \
+	src/login/logind-utmp.c \
+	src/login/logind-acl.h
+
+ifneq ($(HAVE_ACL),)
+_liblogind_core_la_SOURCES += \
+	src/login/logind-acl.c
+endif # HAVE_ACL
+
 systemd_logind_SOURCES = \
+	$(_liblogind_core_la_SOURCES) \
 	src/login/logind.c \
 	src/login/logind.h
 
@@ -31,9 +62,67 @@ nodist_systemd_logind_SOURCES = \
 	src/login/logind-gperf.c
 
 systemd_logind_LDADD = \
-	liblogind-core.la
+	libshared.la
 
 rootlibexec_PROGRAMS += \
 	systemd-logind
 
+
+nodist_systemunit_DATA += \
+	units/systemd-logind.service
+
+dist_systemunit_DATA += \
+	units/user.slice
+
+dist_systemunit_DATA_busnames += \
+	units/org.freedesktop.login1.busname
+
+dist_dbussystemservice_DATA += \
+	src/login/org.freedesktop.login1.service
+
+dist_dbuspolicy_DATA += \
+	src/login/org.freedesktop.login1.conf
+
+nodist_pkgsysconf_DATA += \
+	src/login/logind.conf
+
+polkitpolicy_files += \
+	src/login/org.freedesktop.login1.policy
+
+INSTALL_DIRS += \
+	$(systemdstatedir)
+
+MULTI_USER_TARGET_WANTS += \
+	systemd-logind.service
+
+SYSTEM_UNIT_ALIASES += \
+	systemd-logind.service dbus-org.freedesktop.login1.service
+
+BUSNAMES_TARGET_WANTS += \
+	org.freedesktop.login1.busname
+
+dist_udevrules_DATA += \
+	src/login/70-uaccess.rules \
+	src/login/70-power-switch.rules
+
+nodist_udevrules_DATA += \
+	src/login/71-seat.rules \
+	src/login/73-seat-late.rules
+
+
+polkitpolicy_in_files += \
+	src/login/org.freedesktop.login1.policy.in
+
+gperf_gperf_sources += \
+	src/login/logind-gperf.gperf
+
+EXTRA_DIST += \
+	src/login/71-seat.rules.in \
+	src/login/73-seat-late.rules.in \
+	units/systemd-logind.service.in \
+	src/login/logind.conf.in
+
+sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
+sd.CPPFLAGS += -DKEXEC=\"$(KEXEC)\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-login/liblogind-core/logind-acl.c b/src/grp-login/systemd-logind/logind-acl.c
index 44e49c1dad..44e49c1dad 100644
--- a/src/grp-login/liblogind-core/logind-acl.c
+++ b/src/grp-login/systemd-logind/logind-acl.c
diff --git a/src/grp-login/liblogind-core/logind-acl.h b/src/grp-login/systemd-logind/logind-acl.h
index 7d324ea90a..7d324ea90a 100644
--- a/src/grp-login/liblogind-core/logind-acl.h
+++ b/src/grp-login/systemd-logind/logind-acl.h
diff --git a/src/grp-login/liblogind-core/logind-action.c b/src/grp-login/systemd-logind/logind-action.c
index 0cfeab3fdb..0cfeab3fdb 100644
--- a/src/grp-login/liblogind-core/logind-action.c
+++ b/src/grp-login/systemd-logind/logind-action.c
diff --git a/src/grp-login/liblogind-core/logind-action.h b/src/grp-login/systemd-logind/logind-action.h
index 39ba3cf0f6..39ba3cf0f6 100644
--- a/src/grp-login/liblogind-core/logind-action.h
+++ b/src/grp-login/systemd-logind/logind-action.h
diff --git a/src/grp-login/liblogind-core/logind-button.c b/src/grp-login/systemd-logind/logind-button.c
index 81c82117fc..81c82117fc 100644
--- a/src/grp-login/liblogind-core/logind-button.c
+++ b/src/grp-login/systemd-logind/logind-button.c
diff --git a/src/grp-login/liblogind-core/logind-button.h b/src/grp-login/systemd-logind/logind-button.h
index f30cba2959..f30cba2959 100644
--- a/src/grp-login/liblogind-core/logind-button.h
+++ b/src/grp-login/systemd-logind/logind-button.h
diff --git a/src/grp-login/liblogind-core/logind-core.c b/src/grp-login/systemd-logind/logind-core.c
index 1d6475f8d7..1d6475f8d7 100644
--- a/src/grp-login/liblogind-core/logind-core.c
+++ b/src/grp-login/systemd-logind/logind-core.c
diff --git a/src/grp-login/liblogind-core/logind-dbus.c b/src/grp-login/systemd-logind/logind-dbus.c
index cb51e43a5c..cb51e43a5c 100644
--- a/src/grp-login/liblogind-core/logind-dbus.c
+++ b/src/grp-login/systemd-logind/logind-dbus.c
diff --git a/src/grp-login/liblogind-core/logind-device.c b/src/grp-login/systemd-logind/logind-device.c
index 6165a9ea6e..6165a9ea6e 100644
--- a/src/grp-login/liblogind-core/logind-device.c
+++ b/src/grp-login/systemd-logind/logind-device.c
diff --git a/src/grp-login/liblogind-core/logind-device.h b/src/grp-login/systemd-logind/logind-device.h
index 9e2678d801..9e2678d801 100644
--- a/src/grp-login/liblogind-core/logind-device.h
+++ b/src/grp-login/systemd-logind/logind-device.h
diff --git a/src/grp-login/systemd-logind/logind-gperf.c b/src/grp-login/systemd-logind/logind-gperf.c
new file mode 100644
index 0000000000..9cac645686
--- /dev/null
+++ b/src/grp-login/systemd-logind/logind-gperf.c
@@ -0,0 +1,144 @@
+/* ANSI-C code produced by gperf version 3.0.4 */
+/* Command-line: gperf  */
+/* Computed positions: -k'10' */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+/* The character set is not based on ISO-646.  */
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#endif
+
+
+#include <stddef.h>
+#include "shared/conf-parser.h"
+#include "logind.h"
+#include <string.h>
+
+#define TOTAL_KEYWORDS 23
+#define MIN_WORD_LENGTH 14
+#define MAX_WORD_LENGTH 33
+#define MIN_HASH_VALUE 14
+#define MAX_HASH_VALUE 44
+/* maximum key range = 31, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+logind_gperf_hash (register const char *str, register unsigned int len)
+{
+  static const unsigned char asso_values[] =
+    {
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45,  0, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+       0,  0, 45, 45, 45, 20, 45, 45, 15, 45,
+      45, 10,  0, 45,  0,  0,  0, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45
+    };
+  return len + asso_values[(unsigned char)str[9]];
+}
+
+#ifdef __GNUC__
+__inline
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+const struct ConfigPerfItem *
+logind_gperf_lookup (register const char *str, register unsigned int len)
+{
+  static const struct ConfigPerfItem wordlist[] =
+    {
+      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
+      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
+      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
+      {(char*)0}, {(char*)0},
+      {"Login.NAutoVTs",                    config_parse_unsigned,      0, offsetof(Manager, n_autovts)},
+      {"Login.ReserveVT",                   config_parse_unsigned,      0, offsetof(Manager, reserve_vt)},
+      {"Login.IdleAction",                  config_parse_handle_action, 0, offsetof(Manager, idle_action)},
+      {"Login.SessionsMax",                 config_parse_uint64,        0, offsetof(Manager, sessions_max)},
+      {"Login.UserTasksMax",                config_parse_uint64,        0, offsetof(Manager, user_tasks_max)},
+      {"Login.IdleActionSec",               config_parse_sec,           0, offsetof(Manager, idle_action_usec)},
+      {"Login.HandlePowerKey",              config_parse_handle_action, 0, offsetof(Manager, handle_power_key)},
+      {"Login.HandleLidSwitch",             config_parse_handle_action, 0, offsetof(Manager, handle_lid_switch)},
+      {"Login.HandleSuspendKey",            config_parse_handle_action, 0, offsetof(Manager, handle_suspend_key)},
+      {"Login.HoldoffTimeoutSec",           config_parse_sec,           0, offsetof(Manager, holdoff_timeout_usec)},
+      {"Login.HandleHibernateKey",          config_parse_handle_action, 0, offsetof(Manager, handle_hibernate_key)},
+      {"Login.RemoveIPC",                   config_parse_bool,          0, offsetof(Manager, remove_ipc)},
+      {"Login.RuntimeDirectorySize",        config_parse_tmpfs_size,    0, offsetof(Manager, runtime_dir_size)},
+      {"Login.HandleLidSwitchDocked",       config_parse_handle_action, 0, offsetof(Manager, handle_lid_switch_docked)},
+      {(char*)0},
+      {"Login.PowerKeyIgnoreInhibited",     config_parse_bool,          0, offsetof(Manager, power_key_ignore_inhibited)},
+      {"Login.LidSwitchIgnoreInhibited",    config_parse_bool,          0, offsetof(Manager, lid_switch_ignore_inhibited)},
+      {"Login.SuspendKeyIgnoreInhibited",   config_parse_bool,          0, offsetof(Manager, suspend_key_ignore_inhibited)},
+      {(char*)0},
+      {"Login.HibernateKeyIgnoreInhibited", config_parse_bool,          0, offsetof(Manager, hibernate_key_ignore_inhibited)},
+      {"Login.KillOnlyUsers",               config_parse_strv,          0, offsetof(Manager, kill_only_users)},
+      {(char*)0}, {(char*)0},
+      {"Login.KillExcludeUsers",            config_parse_strv,          0, offsetof(Manager, kill_exclude_users)},
+      {"Login.KillUserProcesses",           config_parse_bool,          0, offsetof(Manager, kill_user_processes)},
+      {"Login.InhibitorsMax",               config_parse_uint64,        0, offsetof(Manager, inhibitors_max)},
+      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
+      {"Login.InhibitDelayMaxSec",          config_parse_sec,           0, offsetof(Manager, inhibit_delay_max)}
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register int key = logind_gperf_hash (str, len);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register const char *s = wordlist[key].section_and_lvalue;
+
+          if (s && *str == *s && !strcmp (str + 1, s + 1))
+            return &wordlist[key];
+        }
+    }
+  return 0;
+}
diff --git a/src/grp-login/liblogind-core/logind-gperf.gperf b/src/grp-login/systemd-logind/logind-gperf.gperf
index 6d5c484439..6d5c484439 100644
--- a/src/grp-login/liblogind-core/logind-gperf.gperf
+++ b/src/grp-login/systemd-logind/logind-gperf.gperf
diff --git a/src/grp-login/liblogind-core/logind-inhibit.c b/src/grp-login/systemd-logind/logind-inhibit.c
index 8a35db0dc8..8a35db0dc8 100644
--- a/src/grp-login/liblogind-core/logind-inhibit.c
+++ b/src/grp-login/systemd-logind/logind-inhibit.c
diff --git a/src/grp-login/liblogind-core/logind-inhibit.h b/src/grp-login/systemd-logind/logind-inhibit.h
index 70de199c60..70de199c60 100644
--- a/src/grp-login/liblogind-core/logind-inhibit.h
+++ b/src/grp-login/systemd-logind/logind-inhibit.h
diff --git a/src/grp-login/liblogind-core/logind-seat-dbus.c b/src/grp-login/systemd-logind/logind-seat-dbus.c
index fbebe6fcff..fbebe6fcff 100644
--- a/src/grp-login/liblogind-core/logind-seat-dbus.c
+++ b/src/grp-login/systemd-logind/logind-seat-dbus.c
diff --git a/src/grp-login/liblogind-core/logind-seat.c b/src/grp-login/systemd-logind/logind-seat.c
index 6525ad5d7b..6525ad5d7b 100644
--- a/src/grp-login/liblogind-core/logind-seat.c
+++ b/src/grp-login/systemd-logind/logind-seat.c
diff --git a/src/grp-login/liblogind-core/logind-seat.h b/src/grp-login/systemd-logind/logind-seat.h
index 7fbeb5a727..7fbeb5a727 100644
--- a/src/grp-login/liblogind-core/logind-seat.h
+++ b/src/grp-login/systemd-logind/logind-seat.h
diff --git a/src/grp-login/liblogind-core/logind-session-dbus.c b/src/grp-login/systemd-logind/logind-session-dbus.c
index 76228d4474..76228d4474 100644
--- a/src/grp-login/liblogind-core/logind-session-dbus.c
+++ b/src/grp-login/systemd-logind/logind-session-dbus.c
diff --git a/src/grp-login/liblogind-core/logind-session-device.c b/src/grp-login/systemd-logind/logind-session-device.c
index 99528488c0..99528488c0 100644
--- a/src/grp-login/liblogind-core/logind-session-device.c
+++ b/src/grp-login/systemd-logind/logind-session-device.c
diff --git a/src/grp-login/liblogind-core/logind-session-device.h b/src/grp-login/systemd-logind/logind-session-device.h
index 4a22decb1d..4a22decb1d 100644
--- a/src/grp-login/liblogind-core/logind-session-device.h
+++ b/src/grp-login/systemd-logind/logind-session-device.h
diff --git a/src/grp-login/liblogind-core/logind-session.c b/src/grp-login/systemd-logind/logind-session.c
index 928f4a6314..928f4a6314 100644
--- a/src/grp-login/liblogind-core/logind-session.c
+++ b/src/grp-login/systemd-logind/logind-session.c
diff --git a/src/grp-login/liblogind-core/logind-session.h b/src/grp-login/systemd-logind/logind-session.h
index 23ff6576c9..23ff6576c9 100644
--- a/src/grp-login/liblogind-core/logind-session.h
+++ b/src/grp-login/systemd-logind/logind-session.h
diff --git a/src/grp-login/liblogind-core/logind-user-dbus.c b/src/grp-login/systemd-logind/logind-user-dbus.c
index d82ced605e..d82ced605e 100644
--- a/src/grp-login/liblogind-core/logind-user-dbus.c
+++ b/src/grp-login/systemd-logind/logind-user-dbus.c
diff --git a/src/grp-login/liblogind-core/logind-user.c b/src/grp-login/systemd-logind/logind-user.c
index 015276efc8..015276efc8 100644
--- a/src/grp-login/liblogind-core/logind-user.c
+++ b/src/grp-login/systemd-logind/logind-user.c
diff --git a/src/grp-login/liblogind-core/logind-user.h b/src/grp-login/systemd-logind/logind-user.h
index b23c59fa1d..b23c59fa1d 100644
--- a/src/grp-login/liblogind-core/logind-user.h
+++ b/src/grp-login/systemd-logind/logind-user.h
diff --git a/src/grp-login/liblogind-core/logind-utmp.c b/src/grp-login/systemd-logind/logind-utmp.c
index c5dc137d61..c5dc137d61 100644
--- a/src/grp-login/liblogind-core/logind-utmp.c
+++ b/src/grp-login/systemd-logind/logind-utmp.c
diff --git a/src/grp-login/logind.conf.in b/src/grp-login/systemd-logind/logind.conf.in
index 32c0844cb6..32c0844cb6 100644
--- a/src/grp-login/logind.conf.in
+++ b/src/grp-login/systemd-logind/logind.conf.in
diff --git a/src/grp-login/liblogind-core/logind.h b/src/grp-login/systemd-logind/logind.h
index effc498118..effc498118 100644
--- a/src/grp-login/liblogind-core/logind.h
+++ b/src/grp-login/systemd-logind/logind.h
diff --git a/src/grp-login/org.freedesktop.login1.conf b/src/grp-login/systemd-logind/org.freedesktop.login1.conf
index c89e40457e..c89e40457e 100644
--- a/src/grp-login/org.freedesktop.login1.conf
+++ b/src/grp-login/systemd-logind/org.freedesktop.login1.conf
diff --git a/src/grp-login/org.freedesktop.login1.policy.in b/src/grp-login/systemd-logind/org.freedesktop.login1.policy.in
index 1fa6441629..1fa6441629 100644
--- a/src/grp-login/org.freedesktop.login1.policy.in
+++ b/src/grp-login/systemd-logind/org.freedesktop.login1.policy.in
diff --git a/src/grp-login/org.freedesktop.login1.service b/src/grp-login/systemd-logind/org.freedesktop.login1.service
index 762dae2bb3..762dae2bb3 100644
--- a/src/grp-login/org.freedesktop.login1.service
+++ b/src/grp-login/systemd-logind/org.freedesktop.login1.service
diff --git a/src/grp-login/systemd-logind/systemd-logind.service.in b/src/grp-login/systemd-logind/systemd-logind.service.in
new file mode 100644
index 0000000000..ff049134ee
--- /dev/null
+++ b/src/grp-login/systemd-logind/systemd-logind.service.in
@@ -0,0 +1,31 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Login Service
+Documentation=man:systemd-logind.service(8) man:logind.conf(5)
+Documentation=http://www.freedesktop.org/wiki/Software/systemd/logind
+Documentation=http://www.freedesktop.org/wiki/Software/systemd/multiseat
+Wants=user.slice
+After=nss-user-lookup.target user.slice
+
+# Ask for the dbus socket. If running over kdbus, the socket will
+# not be actually used.
+Wants=dbus.socket
+After=dbus.socket
+
+[Service]
+ExecStart=@rootlibexecdir@/systemd-logind
+Restart=always
+RestartSec=0
+BusName=org.freedesktop.login1
+CapabilityBoundingSet=CAP_SYS_ADMIN CAP_MAC_ADMIN CAP_AUDIT_CONTROL CAP_CHOWN CAP_KILL CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE CAP_FOWNER CAP_SYS_TTY_CONFIG
+WatchdogSec=3min
+
+# Increase the default a bit in order to allow many simultaneous
+# logins since we keep one fd open per session.
+LimitNOFILE=16384
diff --git a/src/grp-login/systemd-user.m4 b/src/grp-login/systemd-logind/systemd-user.pam.m4
index f188a8e548..f188a8e548 100644
--- a/src/grp-login/systemd-user.m4
+++ b/src/grp-login/systemd-logind/systemd-user.pam.m4
diff --git a/src/grp-login/systemd-logind/user.slice b/src/grp-login/systemd-logind/user.slice
new file mode 100644
index 0000000000..9fa6284c12
--- /dev/null
+++ b/src/grp-login/systemd-logind/user.slice
@@ -0,0 +1,11 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=User and Session Slice
+Documentation=man:systemd.special(7)
+Before=slices.target