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/src/login/logind-dbus.c b/src/login/logind-dbus.c
index e6371ff04d9a323e4af123047097c02e94102be0..e142b8fcfe114b31aeca9f6aeadac1fad6967ed0 100644 (file)
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -822,6 +822,15 @@ static int method_create_session(sd_bus_message *message, void *userdata, sd_bus
          * 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 21d7268120a9b115ce621951d8447cc86370a3c1..39fbb8d1b1638f57407c6cc69ea329d4a1260e00 100644 (file)
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -459,6 +459,7 @@ int user_start(User *u) {
         if (r < 0)
                 return r;
 
+#if 0
         /* Create cgroup */
         r = user_start_slice(u);
         if (r < 0)
@@ -474,6 +475,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);