Merge from 2.2

If you do not have one more expect than issue when talking to the passwd
program you will not send the last issue.
(This used to be commit 8aafec95cba0e8a002d20c4c0055a01690879f7a)

diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c
index 286c316b93f2f9cff43f275006c94fbe932d5baf..741f5ef0aa178814aaae40e6c3036fcc3ce8d474 100644 (file)
--- a/source3/smbd/chgpasswd.c
+++ b/source3/smbd/chgpasswd.c
@@ -312,6 +312,12 @@ static int talktochild(int master, char *seq)
 
                pwd_sub(issue);
        }
+       if (!strequal(issue, ".")) {
+               /* we have one final issue to send */
+               fstrcpy(expected, ".");
+               if (!expect(master, issue, expected))
+                       return False;
+       }
 
        return (count > 0);
 }