summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerb Lewis <herb@samba.org>2001-12-04 22:24:17 +0000
committerHerb Lewis <herb@samba.org>2001-12-04 22:24:17 +0000
commit61fc7b98a73351f92646613989a207908e934d99 (patch)
treee6635519e1427e5b1a87ae59c437205e1cdfffa1
parente9894404bab1ad9d4f998109fd0922c16dbd401a (diff)
downloadsamba-61fc7b98a73351f92646613989a207908e934d99.tar.gz
samba-61fc7b98a73351f92646613989a207908e934d99.tar.bz2
samba-61fc7b98a73351f92646613989a207908e934d99.zip
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)
-rw-r--r--source3/smbd/chgpasswd.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c
index 286c316b93..741f5ef0aa 100644
--- 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);
}