From: Chris Coulson <chris.coulson@canonical.com>
Date: Thu, 15 Mar 2018 23:54:34 +0000 (+0000)
Subject: Handle the case where passwd re-asks for the current password when it was entered... 
X-Git-Tag: archive/raspbian/1%3.28.0-1+rpi1^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=396ae4c24daebb3ecd1b010aa3c48a87e0b6b0be;p=gnome-control-center.git

Handle the case where passwd re-asks for the current password when it was entered incorrectly (when using LDAP)

Based on a patch from Ryan Tandy
Bug-Ubuntu: https:/launchpad.net/bugs/607357
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=786530
Forwarded: yes

Gbp-Pq: Name 06_handle_passwd_with_ldap.patch
---

diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c
index 00239ce..0fd06d9 100644
--- a/panels/user-accounts/run-passwd.c
+++ b/panels/user-accounts/run-passwd.c
@@ -404,7 +404,7 @@ io_watch_stdout (GIOChannel *source, GIOCondition condition, PasswdHandler *pass
 
                         if (is_string_complete (str->str, "assword: ", "failure", "wrong", "error", NULL)) {
 
-                                if (strstr (str->str, "assword: ") != NULL) {
+                                if (strstr (str->str, "assword: ") != NULL && strstr (str->str, "incorrect") == NULL) {
                                         /* Authentication successful */
 
                                         passwd_handler->backend_state = PASSWD_STATE_NEW;