core: fix oom check

[elogind.git] / src / login / pam-module.c

diff --git a/src/login/pam-module.c b/src/login/pam-module.c
index ea606b7fc9447a89b6b365f49704144489df6b5a..18dd4e2e2136482e3a73f1356502ecef269d4bac 100644 (file)
--- a/src/login/pam-module.c
+++ b/src/login/pam-module.c
@@ -169,28 +169,26 @@ static int export_legacy_dbus_address(
                 uid_t uid,
                 const char *runtime) {
 
+#ifdef ENABLE_KDBUS
         _cleanup_free_ char *s = NULL;
         int r;
 
-#ifdef ENABLE_KDBUS
+        /* skip export if kdbus is not active */
+        if (access("/dev/kdbus", F_OK) < 0)
+                return PAM_SUCCESS;
+
         if (asprintf(&s, KERNEL_USER_BUS_FMT ";" UNIX_USER_BUS_FMT,
                      (unsigned long) uid, runtime) < 0) {
                 pam_syslog(handle, LOG_ERR, "Failed to set bus variable.");
                 return PAM_BUF_ERR;
         }
-#else
-        if (asprintf(&s, UNIX_USER_BUS_FMT, runtime) < 0) {
-                pam_syslog(handle, LOG_ERR, "Failed to set bus variable.");
-                return PAM_BUF_ERR;
-        }
-#endif
 
         r = pam_misc_setenv(handle, "DBUS_SESSION_BUS_ADDRESS", s, 0);
         if (r != PAM_SUCCESS) {
                 pam_syslog(handle, LOG_ERR, "Failed to set bus variable.");
                 return r;
         }
-
+#endif
         return PAM_SUCCESS;
 }
 
@@ -323,6 +321,12 @@ _public_ PAM_EXTERN int pam_sm_open_session(
                         get_seat_from_display(display, NULL, &vtnr);
         }
 
+        if (seat && !streq(seat, "seat0")) {
+                pam_syslog(handle, LOG_DEBUG,
+                      "Ignoring vtnr %d for %s which is not seat0", vtnr, seat);
+                vtnr = 0;
+        }
+
         if (!type)
                 type = !isempty(display) ? "x11" :
                         !isempty(tty) ? "tty" : "unspecified";