chiark / gitweb /
Revert "bus: export bus address also when compiled without kdbus"
authorKay Sievers <kay@vrfy.org>
Fri, 10 Jan 2014 22:22:19 +0000 (06:22 +0800)
committerKay Sievers <kay@vrfy.org>
Fri, 10 Jan 2014 22:22:19 +0000 (06:22 +0800)
This reverts commit 9130f2128b64de19a3b7d6db7e0d371adfd296c2.

It's too early to do that. For now we should only "break" the
--enable-kdbus case, not the normal one.

src/login/pam-module.c

index ea606b7..e76fef8 100644 (file)
@@ -169,28 +169,22 @@ 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
         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;
 }