brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gdm/util: Restart auth if default service changed

Browse Source 
If a default service changed while the previous one was active we need to
reset the authentication so that we set back to the expected one.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2267>
This commit is contained in:
Marco Trevisan (Treviño) 2022-10-21 19:05:04 +02:00
parent 9af029e968
commit dc4f0f9053
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/gdm/util.js
View File

@ -519,6 +519,8 @@ export class ShellUserVerifier extends Signals.EventEmitter {
} }
_updateDefaultService() { _updateDefaultService() {
const oldDefaultService = this._defaultService;
if (this._settings.get_boolean(PASSWORD_AUTHENTICATION_KEY)) if (this._settings.get_boolean(PASSWORD_AUTHENTICATION_KEY))
this._defaultService = PASSWORD_SERVICE_NAME; this._defaultService = PASSWORD_SERVICE_NAME;
else if (this._settings.get_boolean(SMARTCARD_AUTHENTICATION_KEY)) else if (this._settings.get_boolean(SMARTCARD_AUTHENTICATION_KEY))
@ -530,6 +532,11 @@ export class ShellUserVerifier extends Signals.EventEmitter {
log('no authentication service is enabled, using password authentication'); log('no authentication service is enabled, using password authentication');
this._defaultService = PASSWORD_SERVICE_NAME; this._defaultService = PASSWORD_SERVICE_NAME;
} }
if (oldDefaultService &&
oldDefaultService !== this._defaultService &&
this._activeServices.has(oldDefaultService))
this._cancelAndReset();
} }
async _startService(serviceName) { async _startService(serviceName) {