X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fpam-module.c;fp=src%2Fpam-module.c;h=b742d649d24f6b274d738b1719b60725d764aecc;hb=98a28fef2618e54a644614c759f371f297381b70;hp=bdf61334e646e9916307d28f20b9122eb13ab9f8;hpb=77527da0a02029ce9c5ec86d5db5ea42147a658f;p=elogind.git

diff --git a/src/pam-module.c b/src/pam-module.c
index bdf61334e..b742d649d 100644
--- a/src/pam-module.c
+++ b/src/pam-module.c
@@ -33,18 +33,17 @@
 #include <security/pam_misc.h>
 
 #include "util.h"
-#include "cgroup-util.h"
 #include "macro.h"
 #include "sd-daemon.h"
 #include "strv.h"
+#include "dbus-common.h"
+#include "def.h"
 
 static int parse_argv(pam_handle_t *handle,
                       int argc, const char **argv,
-                      bool *create_session,
-                      bool *kill_session,
-                      bool *kill_user,
                       char ***controllers,
                       char ***reset_controllers,
+                      bool *kill_processes,
                       char ***kill_only_users,
                       char ***kill_exclude_users,
                       bool *debug) {
@@ -59,32 +58,25 @@ static int parse_argv(pam_handle_t *handle,
         for (i = 0; i < (unsigned) argc; i++) {
                 int k;
 
-                if (startswith(argv[i], "create-session=")) {
+                if (startswith(argv[i], "kill-processes=")) {
                         if ((k = parse_boolean(argv[i] + 15)) < 0) {
-                                pam_syslog(handle, LOG_ERR, "Failed to parse create-session= argument.");
+                                pam_syslog(handle, LOG_ERR, "Failed to parse kill-session= argument.");
                                 return k;
                         }
 
-                        if (create_session)
-                                *create_session = k;
+                        if (kill_processes)
+                                *kill_processes = k;
 
                 } else if (startswith(argv[i], "kill-session=")) {
+                        /* As compatibility for old versions */
+
                         if ((k = parse_boolean(argv[i] + 13)) < 0) {
                                 pam_syslog(handle, LOG_ERR, "Failed to parse kill-session= argument.");
                                 return k;
                         }
 
-                        if (kill_session)
-                                *kill_session = k;
-
-                } else if (startswith(argv[i], "kill-user=")) {
-                        if ((k = parse_boolean(argv[i] + 10)) < 0) {
-                                pam_syslog(handle, LOG_ERR, "Failed to parse kill-user= argument.");
-                                return k;
-                        }
-
-                        if (kill_user)
-                                *kill_user = k;
+                        if (kill_processes)
+                                *kill_processes = k;
 
                 } else if (startswith(argv[i], "controllers=")) {
 
@@ -155,6 +147,11 @@ static int parse_argv(pam_handle_t *handle,
                         if (debug)
                                 *debug = k;
 
+                } else if (startswith(argv[i], "create-session=") ||
+                           startswith(argv[i], "kill-user=")) {
+
+                        pam_syslog(handle, LOG_WARNING, "Option %s not supported anymore, ignoring.", argv[i]);
+
                 } else {
                         pam_syslog(handle, LOG_ERR, "Unknown parameter '%s'.", argv[i]);
                         return -EINVAL;
@@ -173,13 +170,10 @@ static int parse_argv(pam_handle_t *handle,
         }
 
         if (controllers)
-                strv_remove(*controllers, "name=systemd");
+                strv_remove(*controllers, SYSTEMD_CGROUP_CONTROLLER);
 
         if (reset_controllers)
-                strv_remove(*reset_controllers, "name=systemd");
-
-        if (kill_session && *kill_session && kill_user)
-                *kill_user = true;
+                strv_remove(*reset_controllers, SYSTEMD_CGROUP_CONTROLLER);
 
         if (!kill_exclude_users_set && kill_exclude_users) {
                 char **l;
@@ -195,96 +189,6 @@ static int parse_argv(pam_handle_t *handle,
         return 0;
 }
 
-static int open_file_and_lock(const char *fn) {
-        int fd;
-
-        assert(fn);
-
-        if ((fd = open(fn, O_RDWR|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW|O_CREAT, 0600)) < 0)
-                return -errno;
-
-        /* The BSD socket semantics are a lot nicer than those of
-         * POSIX locks. Which is why we use flock() here. BSD locking
-         * does not work across NFS which however is not needed here
-         * as the filesystems in question should be local, and only
-         * locally accessible, and most likely even tmpfs. */
-
-        if (flock(fd, LOCK_EX) < 0) {
-                close_nointr_nofail(fd);
-                return -errno;
-        }
-
-        return fd;
-}
-
-enum {
-        SESSION_ID_AUDIT = 'a',
-        SESSION_ID_COUNTER = 'c',
-        SESSION_ID_RANDOM = 'r'
-};
-
-static uint64_t get_session_id(int *mode) {
-        char *s;
-        int fd;
-
-        assert(mode);
-
-        /* First attempt: let's use the session ID of the audit
-         * system, if it is available. */
-        if (have_effective_cap(CAP_AUDIT_CONTROL) > 0)
-                if (read_one_line_file("/proc/self/sessionid", &s) >= 0) {
-                        uint32_t u;
-                        int r;
-
-                        r = safe_atou32(s, &u);
-                        free(s);
-
-                        if (r >= 0 && u != (uint32_t) -1 && u > 0) {
-                                *mode = SESSION_ID_AUDIT;
-                                return (uint64_t) u;
-                        }
-                }
-
-        /* Second attempt, use our own counter. */
-        if ((fd = open_file_and_lock(RUNTIME_DIR "/user/.pam-systemd-session")) >= 0) {
-                uint64_t counter;
-                ssize_t r;
-
-                /* We do a bit of endianess swapping here, just to be
-                 * sure. /run should be machine specific anyway, and
-                 * even mounted from tmpfs, so this byteswapping
-                 * should really not be necessary. But then again, you
-                 * never know, so let's avoid any risk. */
-
-                if (loop_read(fd, &counter, sizeof(counter), false) != sizeof(counter))
-                        counter = 1;
-                else
-                        counter = le64toh(counter) + 1;
-
-                if (lseek(fd, 0, SEEK_SET) == 0) {
-                        uint64_t swapped = htole64(counter);
-
-                        r = loop_write(fd, &swapped, sizeof(swapped), false);
-
-                        if (r != sizeof(swapped))
-                                r = -EIO;
-                } else
-                        r = -errno;
-
-                close_nointr_nofail(fd);
-
-                if (r >= 0) {
-                        *mode = SESSION_ID_COUNTER;
-                        return counter;
-                }
-        }
-
-        *mode = SESSION_ID_RANDOM;
-
-        /* Last attempt, pick a random value */
-        return (uint64_t) random_ull();
-}
-
 static int get_user_data(
                 pam_handle_t *handle,
                 const char **ret_username,
@@ -346,232 +250,6 @@ static int get_user_data(
         return PAM_SUCCESS;
 }
 
-static int create_user_group(
-                pam_handle_t *handle,
-                const char *controller,
-                const char *group,
-                struct passwd *pw,
-                bool attach,
-                bool remember) {
-
-        int r;
-
-        assert(handle);
-        assert(group);
-
-        if (attach)
-                r = cg_create_and_attach(controller, group, 0);
-        else
-                r = cg_create(controller, group);
-
-        if (r < 0) {
-                pam_syslog(handle, LOG_ERR, "Failed to create cgroup: %s", strerror(-r));
-                return PAM_SESSION_ERR;
-        }
-
-        if (r > 0 && remember) {
-                /* Remember that it was us who created this group, and
-                 * that hence we need to remove it too. This is a
-                 * protection against removing the cgroup when run
-                 * recursively. */
-                if ((r = pam_set_data(handle, "systemd.created", INT_TO_PTR(1), NULL)) != PAM_SUCCESS) {
-                        pam_syslog(handle, LOG_ERR, "Failed to install created variable.");
-                        return r;
-                }
-        }
-
-        if ((r = cg_set_task_access(controller, group, 0644, pw->pw_uid, pw->pw_gid)) < 0 ||
-            (r = cg_set_group_access(controller, group, 0755, pw->pw_uid, pw->pw_gid)) < 0) {
-                pam_syslog(handle, LOG_ERR, "Failed to change access modes: %s", strerror(-r));
-                return PAM_SESSION_ERR;
-        }
-
-        return PAM_SUCCESS;
-}
-
-static int reset_group(
-                pam_handle_t *handle,
-                const char *controller) {
-
-        int r;
-
-        assert(handle);
-
-        if ((r = cg_attach(controller, "/", 0)) < 0) {
-                pam_syslog(handle, LOG_ERR, "Failed to reset cgroup for controller %s: %s", controller, strerror(-r));
-                return PAM_SESSION_ERR;
-        }
-
-        return PAM_SUCCESS;
-}
-
-_public_ PAM_EXTERN int pam_sm_open_session(
-                pam_handle_t *handle,
-                int flags,
-                int argc, const char **argv) {
-
-        const char *username = NULL;
-        struct passwd *pw;
-        int r;
-        char *buf = NULL;
-        int lock_fd = -1;
-        bool create_session = true;
-        bool debug = false;
-        char **controllers = NULL, **reset_controllers = NULL, **c;
-        char *cgroup_user_tree = NULL;
-
-        assert(handle);
-
-        /* pam_syslog(handle, LOG_DEBUG, "pam-systemd initializing"); */
-
-        /* Make this a NOP on non-systemd systems */
-        if (sd_booted() <= 0)
-                return PAM_SUCCESS;
-
-        if (parse_argv(handle,
-                       argc, argv,
-                       &create_session, NULL, NULL,
-                       &controllers, &reset_controllers,
-                       NULL, NULL, &debug) < 0)
-                return PAM_SESSION_ERR;
-
-        if ((r = get_user_data(handle, &username, &pw)) != PAM_SUCCESS)
-                goto finish;
-
-        if ((r = cg_get_user_path(&cgroup_user_tree)) < 0) {
-                pam_syslog(handle, LOG_ERR, "Failed to determine user cgroup tree: %s", strerror(-r));
-                r = PAM_SYSTEM_ERR;
-                goto finish;
-        }
-
-        if (safe_mkdir(RUNTIME_DIR "/user", 0755, 0, 0) < 0) {
-                pam_syslog(handle, LOG_ERR, "Failed to create runtime directory: %m");
-                r = PAM_SYSTEM_ERR;
-                goto finish;
-        }
-
-        if ((lock_fd = open_file_and_lock(RUNTIME_DIR "/user/.pam-systemd-lock")) < 0) {
-                pam_syslog(handle, LOG_ERR, "Failed to lock runtime directory: %m");
-                r = PAM_SYSTEM_ERR;
-                goto finish;
-        }
-
-        /* Create /run/user/$USER */
-        free(buf);
-        if (asprintf(&buf, RUNTIME_DIR "/user/%s", username) < 0) {
-                r = PAM_BUF_ERR;
-                goto finish;
-        }
-
-        if (safe_mkdir(buf, 0700, pw->pw_uid, pw->pw_gid) < 0) {
-                pam_syslog(handle, LOG_WARNING, "Failed to create runtime directory: %m");
-                r = PAM_SYSTEM_ERR;
-                goto finish;
-        } else if ((r = pam_misc_setenv(handle, "XDG_RUNTIME_DIR", buf, 0)) != PAM_SUCCESS) {
-                pam_syslog(handle, LOG_ERR, "Failed to set runtime dir.");
-                goto finish;
-        }
-
-        free(buf);
-        buf = NULL;
-
-        if (create_session) {
-                const char *id;
-
-                /* Reuse or create XDG session ID */
-                if (!(id = pam_getenv(handle, "XDG_SESSION_ID"))) {
-                        int mode;
-
-                        if (asprintf(&buf, "%llux", (unsigned long long) get_session_id(&mode)) < 0) {
-                                r = PAM_BUF_ERR;
-                                goto finish;
-                        }
-
-                        /* To avoid id clashes we add the session id
-                         * source to our session ids. Note that the
-                         * session id source might change during
-                         * runtime, because a filesystem became
-                         * writable or the system reconfigured. */
-                        buf[strlen(buf)-1] =
-                                mode != SESSION_ID_AUDIT ? (char) mode : 0;
-
-                        if ((r = pam_misc_setenv(handle, "XDG_SESSION_ID", buf, 0)) != PAM_SUCCESS) {
-                                pam_syslog(handle, LOG_ERR, "Failed to set session id.");
-                                goto finish;
-                        }
-
-                        if (!(id = pam_getenv(handle, "XDG_SESSION_ID"))) {
-                                pam_syslog(handle, LOG_ERR, "Failed to get session id.");
-                                r = PAM_SESSION_ERR;
-                                goto finish;
-                        }
-                }
-
-                r = asprintf(&buf, "%s/%s/%s", cgroup_user_tree, username, id);
-        } else
-                r = asprintf(&buf, "%s/%s/master", cgroup_user_tree, username);
-
-        if (r < 0) {
-                r = PAM_BUF_ERR;
-                goto finish;
-        }
-
-        if (debug)
-                pam_syslog(handle, LOG_DEBUG, "Moving new user session for %s into control group %s.", username, buf);
-
-        if ((r = create_user_group(handle, SYSTEMD_CGROUP_CONTROLLER, buf, pw, true, true)) != PAM_SUCCESS)
-                goto finish;
-
-        /* The additional controllers don't really matter, so we
-         * ignore the return value */
-        STRV_FOREACH(c, controllers)
-                create_user_group(handle, *c, buf, pw, true, false);
-
-        STRV_FOREACH(c, reset_controllers)
-                reset_group(handle, *c);
-
-        r = PAM_SUCCESS;
-
-finish:
-        free(buf);
-
-        if (lock_fd >= 0)
-                close_nointr_nofail(lock_fd);
-
-        strv_free(controllers);
-        strv_free(reset_controllers);
-
-        free(cgroup_user_tree);
-
-        return r;
-}
-
-static int session_remains(pam_handle_t *handle, const char *user_path) {
-        int r;
-        bool remains = false;
-        DIR *d;
-        char *subgroup;
-
-        if ((r = cg_enumerate_subgroups(SYSTEMD_CGROUP_CONTROLLER, user_path, &d)) < 0)
-                return r;
-
-        while ((r = cg_read_subgroup(d, &subgroup)) > 0) {
-
-                remains = !streq(subgroup, "master");
-                free(subgroup);
-
-                if (remains)
-                        break;
-        }
-
-        closedir(d);
-
-        if (r < 0)
-                return r;
-
-        return !!remains;
-}
-
 static bool check_user_lists(
                 pam_handle_t *handle,
                 uid_t uid,
@@ -588,7 +266,8 @@ static bool check_user_lists(
         else {
                 struct passwd *pw;
 
-                if ((pw = pam_modutil_getpwuid(handle, uid)))
+                pw = pam_modutil_getpwuid(handle, uid);
+                if (pw)
                         name = pw->pw_name;
         }
 
@@ -620,158 +299,211 @@ static bool check_user_lists(
         return false;
 }
 
-_public_ PAM_EXTERN int pam_sm_close_session(
+_public_ PAM_EXTERN int pam_sm_open_session(
                 pam_handle_t *handle,
                 int flags,
                 int argc, const char **argv) {
 
         const char *username = NULL;
-        bool kill_session = false;
-        bool kill_user = false;
-        bool debug = false;
-        int lock_fd = -1, r;
-        char *session_path = NULL, *nosession_path = NULL, *user_path = NULL;
-        const char *id;
         struct passwd *pw;
-        const void *created = NULL;
-        char **controllers = NULL, **c, **kill_only_users = NULL, **kill_exclude_users = NULL;
-        char *cgroup_user_tree = NULL;
+        bool kill_processes = false, debug = false;
+        char **controllers = NULL, **reset_controllers = NULL, **kill_only_users = NULL, **kill_exclude_users = NULL;
+        int r;
+        DBusError error;
+        uint32_t uid, pid;
+        DBusMessageIter iter;
+        dbus_bool_t kp;
+        const char *id, *object_path, *runtime_path, *service = NULL, *tty = NULL, *display = NULL, *remote_user = NULL, *remote_host = NULL, *seat = NULL, *type;
+        int session_fd = -1;
+        DBusConnection *bus = NULL;
+        DBusMessage *m = NULL, *reply = NULL;
+        dbus_bool_t remote;
 
         assert(handle);
 
+        dbus_error_init(&error);
+
+        pam_syslog(handle, LOG_ERR, "pam-systemd initializing");
+
         /* Make this a NOP on non-systemd systems */
         if (sd_booted() <= 0)
                 return PAM_SUCCESS;
 
         if (parse_argv(handle,
                        argc, argv,
-                       NULL, &kill_session, &kill_user,
-                       &controllers, NULL,
-                       &kill_only_users, &kill_exclude_users, &debug) < 0)
+                       &controllers, &reset_controllers,
+                       &kill_processes, &kill_only_users, &kill_exclude_users,
+                       &debug) < 0)
                 return PAM_SESSION_ERR;
 
-        if ((r = get_user_data(handle, &username, &pw)) != PAM_SUCCESS)
+        r = get_user_data(handle, &username, &pw);
+        if (r != PAM_SUCCESS)
                 goto finish;
 
-        if ((r = cg_get_user_path(&cgroup_user_tree)) < 0) {
-                pam_syslog(handle, LOG_ERR, "Failed to determine user cgroup tree: %s", strerror(-r));
-                r = PAM_SYSTEM_ERR;
-                goto finish;
-        }
+        if (kill_processes)
+                kill_processes = check_user_lists(handle, pw->pw_uid, kill_only_users, kill_exclude_users);
 
-        if ((lock_fd = open_file_and_lock(RUNTIME_DIR "/user/.pam-systemd-lock")) < 0) {
-                pam_syslog(handle, LOG_ERR, "Failed to lock runtime directory: %m");
-                r = PAM_SYSTEM_ERR;
+        bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
+        if (!bus) {
+                pam_syslog(handle, LOG_ERR, "Failed to connect to system bus: %s", bus_error_message(&error));
+                r = PAM_SESSION_ERR;
                 goto finish;
         }
 
-        /* We are probably still in some session/user dir. Move ourselves out of the way as first step */
-        if ((r = cg_attach(SYSTEMD_CGROUP_CONTROLLER, cgroup_user_tree, 0)) < 0)
-                pam_syslog(handle, LOG_ERR, "Failed to move us away: %s", strerror(-r));
-
-        STRV_FOREACH(c, controllers)
-                if ((r = cg_attach(*c, cgroup_user_tree, 0)) < 0)
-                        pam_syslog(handle, LOG_ERR, "Failed to move us away in %s hierarchy: %s", *c, strerror(-r));
+        m = dbus_message_new_method_call(
+                        "org.freedesktop.login1",
+                        "/org/freedesktop/login1",
+                        "org.freedesktop.login1.Manager",
+                        "CreateSession");
 
-        if (asprintf(&user_path, "%s/%s", cgroup_user_tree, username) < 0) {
+        if (!m) {
+                pam_syslog(handle, LOG_ERR, "Could not allocate create session message.");
                 r = PAM_BUF_ERR;
                 goto finish;
         }
 
-        pam_get_data(handle, "systemd.created", &created);
-
-        if ((id = pam_getenv(handle, "XDG_SESSION_ID")) && created) {
+        uid = pw->pw_uid;
+        pid = getpid();
+
+        pam_get_item(handle, PAM_SERVICE, (const void**) &service);
+        pam_get_item(handle, PAM_XDISPLAY, (const void**) &display);
+        pam_get_item(handle, PAM_TTY, (const void**) &tty);
+        pam_get_item(handle, PAM_RUSER, (const void**) &remote_user);
+        pam_get_item(handle, PAM_RHOST, (const void**) &remote_host);
+
+        if (isempty(tty))
+                service = "";
+        if (isempty(tty))
+                tty = "";
+        if (isempty(display))
+                display = "";
+        if (isempty(remote_user))
+                remote_user = "";
+        if (isempty(remote_host))
+                remote_host = "";
+        seat = "";
+
+        type = !isempty(display) ? "x11" :
+                   !isempty(tty) ? "tty" : "other";
+
+        remote = !isempty(remote_host) && !streq(remote_host, "localhost") && !streq(remote_host, "localhost.localdomain");
+
+        if (!dbus_message_append_args(m,
+                                      DBUS_TYPE_UINT32, &uid,
+                                      DBUS_TYPE_UINT32, &pid,
+                                      DBUS_TYPE_STRING, &service,
+                                      DBUS_TYPE_STRING, &type,
+                                      DBUS_TYPE_STRING, &seat,
+                                      DBUS_TYPE_STRING, &tty,
+                                      DBUS_TYPE_STRING, &display,
+                                      DBUS_TYPE_BOOLEAN, &remote,
+                                      DBUS_TYPE_STRING, &remote_user,
+                                      DBUS_TYPE_STRING, &remote_host,
+                                      DBUS_TYPE_INVALID)) {
+                pam_syslog(handle, LOG_ERR, "Could not attach parameters to message.");
+                r = PAM_BUF_ERR;
+                goto finish;
+        }
 
-                if (asprintf(&session_path, "%s/%s/%s", cgroup_user_tree, username, id) < 0 ||
-                    asprintf(&nosession_path, "%s/%s/master", cgroup_user_tree, username) < 0) {
-                        r = PAM_BUF_ERR;
-                        goto finish;
-                }
+        dbus_message_iter_init_append(m, &iter);
 
-                if (kill_session && check_user_lists(handle, pw->pw_uid, kill_only_users, kill_exclude_users))  {
-                        if (debug)
-                                pam_syslog(handle, LOG_DEBUG, "Killing remaining processes of user session %s of %s.", id, username);
+        r = bus_append_strv_iter(&iter, controllers);
+        if (r < 0) {
+                pam_syslog(handle, LOG_ERR, "Could not attach parameter to message.");
+                r = PAM_BUF_ERR;
+                goto finish;
+        }
 
-                        /* Kill processes in session cgroup, and delete it */
-                        if ((r = cg_kill_recursive_and_wait(SYSTEMD_CGROUP_CONTROLLER, session_path, true)) < 0)
-                                pam_syslog(handle, LOG_ERR, "Failed to kill session cgroup: %s", strerror(-r));
-                } else {
-                        if (debug)
-                                pam_syslog(handle, LOG_DEBUG, "Moving remaining processes of user session %s of %s into control group %s.", id, username, nosession_path);
+        r = bus_append_strv_iter(&iter, reset_controllers);
+        if (r < 0) {
+                pam_syslog(handle, LOG_ERR, "Could not attach parameter to message.");
+                r = PAM_BUF_ERR;
+                goto finish;
+        }
 
-                        /* Migrate processes from session to user
-                         * cgroup. First, try to create the user group
-                         * in case it doesn't exist yet. Also, delete
-                         * the session group. */
-                        create_user_group(handle, SYSTEMD_CGROUP_CONTROLLER, nosession_path, pw, false, false);
+        kp = kill_processes;
+        if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_BOOLEAN, &kp)) {
+                pam_syslog(handle, LOG_ERR, "Could not attach parameter to message.");
+                r = PAM_BUF_ERR;
+                goto finish;
+        }
 
-                        if ((r = cg_migrate_recursive(SYSTEMD_CGROUP_CONTROLLER, session_path, nosession_path, false, true)) < 0)
-                                pam_syslog(handle, LOG_ERR, "Failed to migrate session cgroup: %s", strerror(-r));
-                }
+        reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error);
+        if (!reply) {
+                pam_syslog(handle, LOG_ERR, "Failed to create session: %s", bus_error_message(&error));
+                r = PAM_SESSION_ERR;
+                goto finish;
+        }
 
-                STRV_FOREACH(c, controllers) {
-                        create_user_group(handle, *c, nosession_path, pw, false, false);
+        if (!dbus_message_get_args(reply, &error,
+                                   DBUS_TYPE_STRING, &id,
+                                   DBUS_TYPE_OBJECT_PATH, &object_path,
+                                   DBUS_TYPE_STRING, &runtime_path,
+                                   DBUS_TYPE_UNIX_FD, &session_fd,
+                                   DBUS_TYPE_INVALID)) {
+                pam_syslog(handle, LOG_ERR, "Failed to parse message: %s", bus_error_message(&error));
+                r = PAM_SESSION_ERR;
+                goto finish;
+        }
 
-                        if ((r = cg_migrate_recursive(*c, session_path, nosession_path, false, true)) < 0)
-                                pam_syslog(handle, LOG_ERR, "Failed to migrate session cgroup in hierarchy %s: %s", *c, strerror(-r));
-                }
+        r = pam_misc_setenv(handle, "XDG_SESSION_ID", id, 0);
+        if (r != PAM_SUCCESS) {
+                pam_syslog(handle, LOG_ERR, "Failed to set session id.");
+                goto finish;
         }
 
-        /* GC user tree */
-        cg_trim(SYSTEMD_CGROUP_CONTROLLER, user_path, false);
+        r = pam_misc_setenv(handle, "XDG_RUNTIME_DIR", runtime_path, 0);
+        if (r != PAM_SUCCESS) {
+                pam_syslog(handle, LOG_ERR, "Failed to set runtime dir.");
+                goto finish;
+        }
 
-        if ((r = session_remains(handle, user_path)) < 0)
-                pam_syslog(handle, LOG_ERR, "Failed to determine whether a session remains: %s", strerror(-r));
+        r = pam_set_data(handle, "systemd.session-fd", INT_TO_PTR(session_fd+1), NULL);
+        if (r != PAM_SUCCESS) {
+                pam_syslog(handle, LOG_ERR, "Failed to install session fd.");
+                return r;
+        }
 
-        /* Kill user processes not attached to any session */
-        if (kill_user && r == 0 && check_user_lists(handle, pw->pw_uid, kill_only_users, kill_exclude_users)) {
+        session_fd = -1;
 
-                /* Kill user cgroup */
-                if ((r = cg_kill_recursive_and_wait(SYSTEMD_CGROUP_CONTROLLER, user_path, true)) < 0)
-                        pam_syslog(handle, LOG_ERR, "Failed to kill user cgroup: %s", strerror(-r));
-        } else {
+        r = PAM_SUCCESS;
 
-                if ((r = cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, user_path, true)) < 0)
-                        pam_syslog(handle, LOG_ERR, "Failed to check user cgroup: %s", strerror(-r));
+finish:
+        strv_free(controllers);
+        strv_free(reset_controllers);
+        strv_free(kill_only_users);
+        strv_free(kill_exclude_users);
 
-                /* Remove user cgroup */
-                if (r > 0) {
-                        if ((r = cg_delete(SYSTEMD_CGROUP_CONTROLLER, user_path)) < 0)
-                                pam_syslog(handle, LOG_ERR, "Failed to delete user cgroup: %s", strerror(-r));
+        dbus_error_free(&error);
 
-                /* If we managed to find somebody, don't cleanup the cgroup. */
-                } else if (r == 0)
-                        r = -EBUSY;
+        if (bus) {
+                dbus_connection_close(bus);
+                dbus_connection_unref(bus);
         }
 
-        STRV_FOREACH(c, controllers)
-                cg_trim(*c, user_path, true);
-
-        if (r >= 0) {
-                const char *runtime_dir;
+        if (reply)
+                dbus_message_unref(reply);
 
-                if ((runtime_dir = pam_getenv(handle, "XDG_RUNTIME_DIR")))
-                        if ((r = rm_rf(runtime_dir, false, true)) < 0)
-                                pam_syslog(handle, LOG_ERR, "Failed to remove runtime directory: %s", strerror(-r));
-        }
+        if (m)
+                dbus_message_unref(m);
 
-        /* pam_syslog(handle, LOG_DEBUG, "pam-systemd done"); */
+        if (session_fd >= 0)
+                close_nointr_nofail(session_fd);
 
-        r = PAM_SUCCESS;
+        return r;
+}
 
-finish:
-        if (lock_fd >= 0)
-                close_nointr_nofail(lock_fd);
+_public_ PAM_EXTERN int pam_sm_close_session(
+                pam_handle_t *handle,
+                int flags,
+                int argc, const char **argv) {
 
-        free(session_path);
-        free(nosession_path);
-        free(user_path);
+        const void *p = NULL;
 
-        strv_free(controllers);
-        strv_free(kill_exclude_users);
-        strv_free(kill_only_users);
+        pam_get_data(handle, "systemd.session-fd", &p);
 
-        free(cgroup_user_tree);
+        if (p)
+                close_nointr(PTR_TO_INT(p) - 1);
 
-        return r;
+        return PAM_SUCCESS;
 }