chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cryptsetup-generator: Split main() into more functions and use hasmaps
[elogind.git]
/
src
/
login
/
pam_systemd.c
diff --git
a/src/login/pam_systemd.c
b/src/login/pam_systemd.c
index f522d6ec4f20fa83b8b1ecefa22bc8cbb0019174..111e2b7c4c83f2fc1ddb4e129c3a10d1f69af1da 100644
(file)
--- 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_pw = pw;
- *ret_username = username
? username : pw->pw_name
;
+ *ret_username = username;
return PAM_SUCCESS;
}
return PAM_SUCCESS;
}
@@
-180,11
+180,10
@@
static int export_legacy_dbus_address(
int r;
/* skip export if kdbus is not active */
int r;
/* skip export if kdbus is not active */
- if (access("/
dev
/kdbus", F_OK) < 0)
+ if (access("/
sys/fs
/kdbus", F_OK) < 0)
return PAM_SUCCESS;
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;
}
pam_syslog(handle, LOG_ERR, "Failed to set bus variable.");
return PAM_BUF_ERR;
}
@@
-213,7
+212,7
@@
_public_ PAM_EXTERN int pam_sm_open_session(
*seat = NULL,
*type = NULL, *class = NULL,
*class_pam = NULL, *type_pam = NULL, *cvtnr = NULL, *desktop = NULL;
*seat = NULL,
*type = NULL, *class = NULL,
*class_pam = NULL, *type_pam = NULL, *cvtnr = NULL, *desktop = NULL;
- _cleanup_bus_unref_ sd_bus *bus = NULL;
+ _cleanup_bus_
close_
unref_ sd_bus *bus = NULL;
int session_fd = -1, existing, r;
bool debug = false, remote;
struct passwd *pw;
int session_fd = -1, existing, r;
bool debug = false, remote;
struct passwd *pw;
@@
-496,7
+495,7
@@
_public_ PAM_EXTERN int pam_sm_close_session(
int argc, const char **argv) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
int argc, const char **argv) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
- _cleanup_bus_unref_ sd_bus *bus = NULL;
+ _cleanup_bus_
close_
unref_ sd_bus *bus = NULL;
const void *existing = NULL;
const char *id;
int r;
const void *existing = NULL;
const char *id;
int r;