Prep v234: Check against TRANSPORT_LOCAL in check_inhibitors()

[elogind.git] / src / login / pam_elogind.c

diff --git a/src/login/pam_elogind.c b/src/login/pam_elogind.c
index 4f023640f6517f953a74d4036e27604677b06f2f..472abdede3299444d487e381f3609ec66e828c77 100644 (file)
--- a/src/login/pam_elogind.c
+++ b/src/login/pam_elogind.c
@@ -36,7 +36,7 @@
 #include "def.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "formats-util.h"
+#include "format-util.h"
 #include "hostname-util.h"
 #include "login-util.h"
 #include "macro.h"
@@ -186,7 +186,7 @@ static int export_legacy_dbus_address(
          * daemons that spawn dbus-daemon, instead of forcing
          * DBUS_SESSION_BUS_ADDRESS= here. */
 
-        s = strjoin(runtime, "/bus", NULL);
+        s = strjoin(runtime, "/bus");
         if (!s)
                 goto error;
 
@@ -244,7 +244,11 @@ _public_ PAM_EXTERN int pam_sm_open_session(
                 return PAM_SESSION_ERR;
 
         if (debug)
+#if 0 /// This is pam-elogind, not pam-systemd
                 pam_syslog(handle, LOG_DEBUG, "pam-systemd initializing");
+#else
+                pam_syslog(handle, LOG_DEBUG, "pam-systemd initializing");
+#endif // 0
 
         r = get_user_data(handle, &username, &pw);
         if (r != PAM_SUCCESS) {