X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Fpam_systemd.c;h=111e2b7c4c83f2fc1ddb4e129c3a10d1f69af1da;hb=affc3d834347076e8616948978e70ed1fca84db4;hp=9250a6903a83fda59dfdc8c3d2a3470fcbfed872;hpb=63cc4c3138fd0ce9cc97884373a2dd8959a13ee9;p=elogind.git

diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
index 9250a6903..111e2b7c4 100644
--- a/src/login/pam_systemd.c
+++ b/src/login/pam_systemd.c
@@ -114,7 +114,7 @@ static int get_user_data(
         }
 
         *ret_pw = pw;
-        *ret_username = username ? username : pw->pw_name;
+        *ret_username = username;
 
         return PAM_SUCCESS;
 }
@@ -183,8 +183,7 @@ static int export_legacy_dbus_address(
         if (access("/sys/fs/kdbus", F_OK) < 0)
                 return PAM_SUCCESS;
 
-        if (asprintf(&s, KERNEL_USER_BUS_FMT ";" UNIX_USER_BUS_FMT,
-                     uid, runtime) < 0) {
+        if (asprintf(&s, KERNEL_USER_BUS_ADDRESS_FMT ";" UNIX_USER_BUS_ADDRESS_FMT, uid, runtime) < 0) {
                 pam_syslog(handle, LOG_ERR, "Failed to set bus variable.");
                 return PAM_BUF_ERR;
         }