[gnome-control-center/uajain/handle-passwd-with-ldap] Handle the case where passwd re-asks for the current password when it was entered incorrectly (when

[Umang Jain <uajain src gnome org>]

commit 7c82898bce4cdeda13ef3dbf6ee068d112340ec8
Author: Chris Coulson <chris coulson canonical com>
Date:   Thu Mar 15 23:54:34 2018 +0000

    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

 panels/user-accounts/run-passwd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c
index 00239ce0f..0fd06d903 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;