summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-11-16 00:10:57 +0100
committerLennart Poettering <lennart@poettering.net>2010-11-16 00:10:57 +0100
commitd90b9d27af56f808a275789c7aa228f6300175d7 (patch)
tree1398f9564f6c3187564c2b0c59f639f8c5a2a82f /src
parent0baf24ddd51fe3399ede0ed5a92f02e54e5ea1ef (diff)
pam: always rely on loginuid instead of uid to determine cgroup and XDG_RUNTIME_DIR
Diffstat (limited to 'src')
-rw-r--r--src/pam-module.c40
1 files changed, 29 insertions, 11 deletions
diff --git a/src/pam-module.c b/src/pam-module.c
index d9458df98b..bc99684e11 100644
--- a/src/pam-module.c
+++ b/src/pam-module.c
@@ -128,7 +128,7 @@ static uint64_t get_session_id(int *mode) {
r = safe_atou32(s, &u);
free(s);
- if (r >= 0 && u != (uint32_t) -1) {
+ if (r >= 0 && u != (uint32_t) -1 && u > 0) {
*mode = SESSION_ID_AUDIT;
return (uint64_t) u;
}
@@ -179,31 +179,49 @@ static int get_user_data(
const char **ret_username,
struct passwd **ret_pw) {
- const char *username;
- struct passwd *pw;
+ const char *username = NULL;
+ struct passwd *pw = NULL;
int r;
+ bool have_loginuid = false;
+ char *s;
assert(handle);
assert(ret_username);
assert(ret_pw);
- if ((r = pam_get_user(handle, &username, NULL)) != PAM_SUCCESS) {
- pam_syslog(handle, LOG_ERR, "Failed to get user name.");
- return r;
+ if (read_one_line_file("/proc/self/loginuid", &s) >= 0) {
+ uint32_t u;
+
+ r = safe_atou32(s, &u);
+ free(s);
+
+ if (r >= 0 && u != (uint32_t) -1 && u > 0) {
+ have_loginuid = true;
+ pw = pam_modutil_getpwuid(handle, u);
+ }
}
- if (!username || !*username) {
- pam_syslog(handle, LOG_ERR, "User name not valid.");
- return PAM_AUTH_ERR;
+ if (!have_loginuid) {
+ if ((r = pam_get_user(handle, &username, NULL)) != PAM_SUCCESS) {
+ pam_syslog(handle, LOG_ERR, "Failed to get user name.");
+ return r;
+ }
+
+ if (!username || !*username) {
+ pam_syslog(handle, LOG_ERR, "User name not valid.");
+ return PAM_AUTH_ERR;
+ }
+
+ pw = pam_modutil_getpwnam(handle, username);
}
- if (!(pw = pam_modutil_getpwnam(handle, username))) {
+ if (!pw) {
pam_syslog(handle, LOG_ERR, "Failed to get user data.");
return PAM_USER_UNKNOWN;
}
*ret_pw = pw;
- *ret_username = username;
+ *ret_username = username ? username : pw->pw_name;
return PAM_SUCCESS;
}