Fix password auth after secondary service failure

Related: #1942443
This commit is contained in:
Benjamin Berg 2021-04-23 18:47:44 +02:00 committed by Adam Williamson
parent a39c114648
commit b71d55a47c
2 changed files with 42 additions and 1 deletions

View File

@ -0,0 +1,34 @@
From 0074c6870b284578d25c06b61ab8011cf8bbb8da Mon Sep 17 00:00:00 2001
From: Benjamin Berg <bberg@redhat.com>
Date: Fri, 23 Apr 2021 19:44:52 +0200
Subject: [PATCH] gdm: Only emit verification failed for foreground service
A failing background service should not count as a verification failure
as the user can still try to continue using the current foreground
service.
As such, only emit the 'verification-failed' signal when the failing
service was the foreground service.
Closes: #3853
---
js/gdm/util.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/js/gdm/util.js b/js/gdm/util.js
index 1ee84acde..e7e575dba 100644
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -721,7 +721,8 @@ var ShellUserVerifier = class {
}
}
- this.emit('verification-failed', serviceName, canRetry);
+ if (this.serviceIsForeground(serviceName))
+ this.emit('verification-failed', serviceName, canRetry);
}
_onServiceUnavailable(_client, serviceName, errorMessage) {
--
2.30.2

View File

@ -2,7 +2,7 @@
Name: gnome-shell Name: gnome-shell
Version: 40.0 Version: 40.0
Release: 3%{?dist} Release: 4%{?dist}
Summary: Window management and application launching for GNOME Summary: Window management and application launching for GNOME
License: GPLv2+ License: GPLv2+
@ -20,6 +20,9 @@ Patch10001: 0001-loginDialog-Allow-timed-login-with-disabled-user-lis.patch
Patch10002: 0001-workspacesView-Fix-PgUp-PgDown-shortcut.patch Patch10002: 0001-workspacesView-Fix-PgUp-PgDown-shortcut.patch
Patch10003: 0002-workspacesView-Don-t-tie-PgUp-PgDown-to-mapped-state.patch Patch10003: 0002-workspacesView-Don-t-tie-PgUp-PgDown-to-mapped-state.patch
# Some users might have a broken PAM config, so we really need this
Patch10004: 0001-gdm-Only-emit-verification-failed-for-foreground-ser.patch
%define eds_version 3.33.1 %define eds_version 3.33.1
%define gnome_desktop_version 3.35.91 %define gnome_desktop_version 3.35.91
@ -234,6 +237,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
%{_mandir}/man1/gnome-shell.1* %{_mandir}/man1/gnome-shell.1*
%changelog %changelog
* Fri Apr 23 2021 Benjamin Berg <bberg@redhat.com> - 40.0-4
- Fix password auth after secondary service failure
Related: #1942443
* Tue Apr 13 2021 Adam Williamson <awilliam@redhat.com> - 40.0-3 * Tue Apr 13 2021 Adam Williamson <awilliam@redhat.com> - 40.0-3
- Fix scrolling between workspaces/app grid pages with PgUp/PgDn - Fix scrolling between workspaces/app grid pages with PgUp/PgDn