From f6ed3d9f884a4e37dd42d56186973db1f232df52 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 13 Mar 2014 13:43:36 -0400 Subject: [PATCH] authPrompt: Don't ever ask for a username if smartcard service is in foreground The smartcard service is put in the foreground in two cases: 1) If password service is disabled by admin configuratoin 2) if a smartcard is inserted In either case we don't want to ask the user to pick a user from the userlist. We currently only avoid asking in case 2. This commit fixes case 1. https://bugzilla.gnome.org/show_bug.cgi?id=726263 --- js/gdm/authPrompt.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js index 6fe14ff3d..4160a5668 100644 --- a/js/gdm/authPrompt.js +++ b/js/gdm/authPrompt.js @@ -450,8 +450,7 @@ const AuthPrompt = new Lang.Class({ // respond to the request with the username beginRequestType = BeginRequestType.PROVIDE_USERNAME; } else if (this._userVerifier.serviceIsForeground(GdmUtil.OVIRT_SERVICE_NAME) || - (this.smartcardDetected && - this._userVerifier.serviceIsForeground(GdmUtil.SMARTCARD_SERVICE_NAME))) { + this._userVerifier.serviceIsForeground(GdmUtil.SMARTCARD_SERVICE_NAME)) { // We don't need to know the username if the user preempted the login screen // with a smartcard or with preauthenticated oVirt credentials beginRequestType = BeginRequestType.DONT_PROVIDE_USERNAME;