Actually working with pam

* src/login/logind-user.c (user_start): Don't start slices and
  systemd-user services.

* src/login/logind-dbus.c (method_create_session): Send a reply directly
  instead of waiting on systemd that isn't there.

* configure.ac: Bump version.

diff --git a/configure.ac b/configure.ac
index 69d2d9bc0c478c093aef049b0750d8bd6707021b..cfe7c8c61f6db8faf99be0e2c219b3b5a1a3be97 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_PREREQ([2.64])
 
 # FIXME: Update to proper web page
 AC_INIT([elogind],
-        [219.3],
+        [219.5],
         [http://bugs.freedesktop.org/enter_bug.cgi?product=elogind],
         [elogind],
         [http://www.freedesktop.org/wiki/Software/elogind])

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index a3d49efbdd45cced85703cbbc19e818c79c3b530..b2f53ae017564120a88ed5605cc6be45bb924edd 100644 (file)
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -797,6 +797,15 @@ static int method_create_session(sd_bus *bus, sd_bus_message *message, void *use
          * created. We send the reply back from
          * session_send_create_reply(). */
 
+        /* Elogind note: replying directly, since we're not actually
+           starting slices and thus we aren't waiting on systemd.  */
+
+        r = session_send_create_reply(session, NULL);
+        if (r < 0)
+                goto fail;
+
+        session_save(session);
+
         return 1;
 
 fail:

diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index 294c1e799cdcbf9f00fb1acf2d2dc9be0a0c02cb..c0d0b967ae4c7e52fb5ddb1b9c50aac0b5ad945d 100644 (file)
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -446,6 +446,7 @@ int user_start(User *u) {
         if (r < 0)
                 return r;
 
+#if 0
         /* Create cgroup */
         r = user_start_slice(u);
         if (r < 0)
@@ -455,6 +456,7 @@ int user_start(User *u) {
         r = user_start_service(u);
         if (r < 0)
                 return r;
+#endif
 
         if (!dual_timestamp_is_set(&u->timestamp))
                 dual_timestamp_get(&u->timestamp);