diff options
author | Sven Eden <yamakuzure@gmx.net> | 2017-08-14 09:16:15 +0200 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2017-08-14 09:20:57 +0200 |
commit | c1480d46a9e8781a15aa5553330a1230afde245b (patch) | |
tree | 8391aa0140484e014a23083603bcb727089d9e7c /src/login/logind-dbus.c | |
parent | 702f867ba334c116569501d9a5c84283ad7d48aa (diff) |
Prep v235: Apply upstream fixes (6/10) [src/login]
Diffstat (limited to 'src/login/logind-dbus.c')
-rw-r--r-- | src/login/logind-dbus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 0b0109ad3..0abf4d50e 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -771,8 +771,8 @@ static int method_create_session(sd_bus_message *message, void *userdata, sd_bus if (hashmap_size(m->sessions) >= m->sessions_max) return sd_bus_error_setf(error, SD_BUS_ERROR_LIMITS_EXCEEDED, "Maximum number of sessions (%" PRIu64 ") reached, refusing further sessions.", m->sessions_max); - audit_session_from_pid(leader, &audit_id); - if (audit_id > 0) { + (void) audit_session_from_pid(leader, &audit_id); + if (audit_session_is_valid(audit_id)) { /* Keep our session IDs and the audit session IDs in sync */ if (asprintf(&id, "%"PRIu32, audit_id) < 0) @@ -784,7 +784,7 @@ static int method_create_session(sd_bus_message *message, void *userdata, sd_bus * ID */ if (hashmap_get(m->sessions, id)) { log_warning("Existing logind session ID %s used by new audit session, ignoring", id); - audit_id = 0; + audit_id = AUDIT_SESSION_INVALID; id = mfree(id); } |