|
 |
4e44f9 |
From 26705ee64f4d3628eaaf45db980c435fa26e112a Mon Sep 17 00:00:00 2001
|
|
|
4e44f9 |
From: Chingkai Chu <3013329+chuchingkai@users.noreply.github.com>
|
|
|
4e44f9 |
Date: Thu, 12 Aug 2021 10:34:01 +0800
|
|
|
4e44f9 |
Subject: [PATCH] session-worker: Set session_vt=0 out of pam uninitialization
|
|
|
4e44f9 |
|
|
|
4e44f9 |
MR GNOME/gdm!123 moved jump_to_vt and session_vt reseting to a
|
|
|
4e44f9 |
separate function, so we don't need to reset session_vt in pam
|
|
|
4e44f9 |
uninitialization.
|
|
|
4e44f9 |
|
|
|
4e44f9 |
https://gitlab.gnome.org/GNOME/gdm/-/issues/719
|
|
|
4e44f9 |
---
|
|
|
4e44f9 |
daemon/gdm-session-worker.c | 2 --
|
|
|
4e44f9 |
1 file changed, 2 deletions(-)
|
|
|
4e44f9 |
|
|
|
4e44f9 |
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
|
|
|
4e44f9 |
index 7d7d2496..3ad94e2a 100644
|
|
|
4e44f9 |
--- a/daemon/gdm-session-worker.c
|
|
|
4e44f9 |
+++ b/daemon/gdm-session-worker.c
|
|
|
4e44f9 |
@@ -1076,62 +1076,60 @@ gdm_session_worker_set_state (GdmSessionWorker *worker,
|
|
|
4e44f9 |
|
|
|
4e44f9 |
static void
|
|
|
4e44f9 |
gdm_session_worker_uninitialize_pam (GdmSessionWorker *worker,
|
|
|
4e44f9 |
int status)
|
|
|
4e44f9 |
{
|
|
|
4e44f9 |
g_debug ("GdmSessionWorker: uninitializing PAM");
|
|
|
4e44f9 |
|
|
|
4e44f9 |
if (worker->priv->pam_handle == NULL)
|
|
|
4e44f9 |
return;
|
|
|
4e44f9 |
|
|
|
4e44f9 |
gdm_session_worker_get_username (worker, NULL);
|
|
|
4e44f9 |
|
|
|
4e44f9 |
if (worker->priv->state >= GDM_SESSION_WORKER_STATE_SESSION_OPENED) {
|
|
|
4e44f9 |
pam_close_session (worker->priv->pam_handle, 0);
|
|
|
4e44f9 |
gdm_session_auditor_report_logout (worker->priv->auditor);
|
|
|
4e44f9 |
} else {
|
|
|
4e44f9 |
gdm_session_auditor_report_login_failure (worker->priv->auditor,
|
|
|
4e44f9 |
status,
|
|
|
4e44f9 |
pam_strerror (worker->priv->pam_handle, status));
|
|
|
4e44f9 |
}
|
|
|
4e44f9 |
|
|
|
4e44f9 |
if (worker->priv->state >= GDM_SESSION_WORKER_STATE_ACCREDITED) {
|
|
|
4e44f9 |
pam_setcred (worker->priv->pam_handle, PAM_DELETE_CRED);
|
|
|
4e44f9 |
}
|
|
|
4e44f9 |
|
|
|
4e44f9 |
pam_end (worker->priv->pam_handle, status);
|
|
|
4e44f9 |
worker->priv->pam_handle = NULL;
|
|
|
4e44f9 |
|
|
|
4e44f9 |
gdm_session_worker_stop_auditor (worker);
|
|
|
4e44f9 |
|
|
|
4e44f9 |
- worker->priv->session_vt = 0;
|
|
|
4e44f9 |
-
|
|
|
4e44f9 |
g_debug ("GdmSessionWorker: state NONE");
|
|
|
4e44f9 |
gdm_session_worker_set_state (worker, GDM_SESSION_WORKER_STATE_NONE);
|
|
|
4e44f9 |
}
|
|
|
4e44f9 |
|
|
|
4e44f9 |
static char *
|
|
|
4e44f9 |
_get_tty_for_pam (const char *x11_display_name,
|
|
|
4e44f9 |
const char *display_device)
|
|
|
4e44f9 |
{
|
|
|
4e44f9 |
#ifdef __sun
|
|
|
4e44f9 |
return g_strdup (display_device);
|
|
|
4e44f9 |
#else
|
|
|
4e44f9 |
return g_strdup (x11_display_name);
|
|
|
4e44f9 |
#endif
|
|
|
4e44f9 |
}
|
|
|
4e44f9 |
|
|
|
4e44f9 |
#ifdef PAM_XAUTHDATA
|
|
|
4e44f9 |
static struct pam_xauth_data *
|
|
|
4e44f9 |
_get_xauth_for_pam (const char *x11_authority_file)
|
|
|
4e44f9 |
{
|
|
|
4e44f9 |
FILE *fh;
|
|
|
4e44f9 |
Xauth *auth = NULL;
|
|
|
4e44f9 |
struct pam_xauth_data *retval = NULL;
|
|
|
4e44f9 |
gsize len = sizeof (*retval) + 1;
|
|
|
4e44f9 |
|
|
|
4e44f9 |
fh = fopen (x11_authority_file, "r");
|
|
|
4e44f9 |
if (fh) {
|
|
|
4e44f9 |
auth = XauReadAuth (fh);
|
|
|
4e44f9 |
fclose (fh);
|
|
|
4e44f9 |
}
|
|
|
4e44f9 |
if (auth) {
|
|
|
4e44f9 |
--
|
|
|
4e44f9 |
2.32.0
|
|
|
4e44f9 |
|