Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/daemon/Auth.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -199,16 +199,15 @@ namespace DDM {
return;
active = false;
qint64 pid = m_session->processId();
QString vt = m_env.value(QStringLiteral("XDG_VTNR"));
QString displayId = m_env.value(QStringLiteral("DISPLAY"));
if (m_session->state() != QProcess::NotRunning)
m_session->stop();
if (m_pam->sessionOpened)
m_pam->closeSession();

// write logout to utmp/wtmp
if (pid > 0) {
QProcessEnvironment env = m_session->processEnvironment();
QString vt = env.value(QStringLiteral("XDG_VTNR"));
QString displayId = env.value(QStringLiteral("DISPLAY"));
utmpLogout(vt, displayId, pid);
}
}
Expand Down
3 changes: 3 additions & 0 deletions src/daemon/Display.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,9 @@ namespace DDM {
}

void Display::logout([[maybe_unused]] QLocalSocket *socket, int id) {
for (Auth *auth : std::as_const(auths))
if (auth->xdgSessionId == id)
auth->stop();
OrgFreedesktopLogin1ManagerInterface manager(Logind::serviceName(), Logind::managerPath(), QDBusConnection::systemBus());
manager.TerminateSession(QString::number(id));
}
Expand Down