#11 Fix password auth after secondary service failure
Merged 3 years ago by adamwill. Opened 3 years ago by benzea.
rpms/ benzea/gnome-shell f34  into  f34

@@ -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

+ 

file modified
+8 -1
@@ -2,7 +2,7 @@ 

  

  Name:           gnome-shell

  Version:        40.0

- Release:        3%{?dist}

+ Release:        4%{?dist}

  Summary:        Window management and application launching for GNOME

  

  License:        GPLv2+
@@ -20,6 +20,9 @@ 

  Patch10002: 0001-workspacesView-Fix-PgUp-PgDown-shortcut.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 gnome_desktop_version 3.35.91
@@ -234,6 +237,10 @@ 

  %{_mandir}/man1/gnome-shell.1*

  

  %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

  - Fix scrolling between workspaces/app grid pages with PgUp/PgDn

  

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

rebased onto 4a49c6c

3 years ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

I'd go ahead and merge this, but waiting for the additional review of the upstream PR that Ray said he would like to see.

Eh, well, still no response on the additional review, so let's go ahead and send this to testing at least.

Pull-Request has been merged by adamwill

3 years ago