chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: auto-convert the simple cases to log_*_errno()
[elogind.git]
/
src
/
login
/
pam_systemd.c
diff --git
a/src/login/pam_systemd.c
b/src/login/pam_systemd.c
index 262621d43fd3631eaa14b5d033d7be0f58217ac4..4974c513382722ece7149b23cdb366aeb053dcfd 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,7
+180,7
@@
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;
if (asprintf(&s, KERNEL_USER_BUS_FMT ";" UNIX_USER_BUS_FMT,
return PAM_SUCCESS;
if (asprintf(&s, KERNEL_USER_BUS_FMT ";" UNIX_USER_BUS_FMT,
@@
-213,7
+213,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;
@@
-357,9
+357,7
@@
_public_ PAM_EXTERN int pam_sm_open_session(
if (isempty(class))
class = streq(type, "unspecified") ? "background" : "user";
if (isempty(class))
class = streq(type, "unspecified") ? "background" : "user";
- remote = !isempty(remote_host) &&
- !streq_ptr(remote_host, "localhost") &&
- !streq_ptr(remote_host, "localhost.localdomain");
+ remote = !isempty(remote_host) && !is_localhost(remote_host);
/* Talk to logind over the message bus */
/* Talk to logind over the message bus */
@@
-498,7
+496,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;