Package: lightdm-gtk-greeter
Version: 1.6.0-1
Severity: normal
Tags: upstream patch
Dear Maintainer,
Whenever PAM fails the message: "Incorrect password, please try again"
appears ignoring the real message from the PAM, which might be
e.g. "access denied". This of course, is very confusing to users who
thinks they've forgotten their passwords.
The attached patch displays the "Incorrect password" message only if
there's no other message displayed.
Regards,
Yair.
-- System Information:
Debian Release: jessie/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1,
'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.9.3-aufs-mos-1 (SMP w/4 CPU cores)
Locale: LANG=C, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages lightdm-gtk-greeter depends on:
ii libc6 2.17-7
ii libcairo2 1.12.14-4
ii libgdk-pixbuf2.0-0 2.28.2-1
ii libglib2.0-0 2.36.3-3
ii libgtk-3-0 3.8.2-3
ii liblightdm-gobject-1-0 1.6.0-3
ii libx11-6 2:1.6.0-1
Versions of packages lightdm-gtk-greeter recommends:
ii desktop-base 7.0.3
ii gnome-icon-theme 3.8.2-2
ii gnome-themes-standard 3.8.1-2
ii policykit-1 0.105-3
lightdm-gtk-greeter suggests no packages.
-- no debconf information
--- lightdm-gtk-greeter-1.6.0.orig/src/lightdm-gtk-greeter.c
+++ lightdm-gtk-greeter-1.6.0/src/lightdm-gtk-greeter.c
@@ -388,6 +388,12 @@ set_message_label (const gchar *text)
gtk_label_set_text (message_label, text);
}
+static const gchar*
+get_message_label ()
+{
+ return gtk_label_get_text (message_label);
+}
+
static void
set_login_button_label (const gchar *username)
{
@@ -910,7 +916,8 @@ authentication_complete_cb (LightDMGreet
{
if (prompted)
{
- set_message_label (_("Incorrect password, please try again"));
+ if (get_message_label()[0] == 0)
+ set_message_label (_("Incorrect password, please try again"));
start_authentication (lightdm_greeter_get_authentication_user (greeter));
}
else
