summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-04-19 13:08:14 +0200
committerVolker Lendecke <vl@samba.org>2008-04-19 17:04:09 +0200
commitc071b941e6090a2b107a8a42835e6da772161425 (patch)
tree56795f5e357374bf77a3abaddb1789cc0997be0a
parenta8ab283508993b51c51061fbef91deeb53456ab5 (diff)
downloadsamba-c071b941e6090a2b107a8a42835e6da772161425.tar.gz
samba-c071b941e6090a2b107a8a42835e6da772161425.tar.bz2
samba-c071b941e6090a2b107a8a42835e6da772161425.zip
Fix bug 5398
Thanks to Jason Mader for sending the compiler output :-) Volker (This used to be commit 7a57c2da1a6cc0fcea0b4d949c696219f1822694)
-rw-r--r--source3/smbd/chgpasswd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c
index b2b082363f..2596e73380 100644
--- a/source3/smbd/chgpasswd.c
+++ b/source3/smbd/chgpasswd.c
@@ -249,6 +249,7 @@ static int expect(int master, char *issue, char *expected)
bool match = False;
for (attempts = 0; attempts < 2; attempts++) {
+ NTSTATUS status;
if (!strequal(issue, ".")) {
if (lp_passwd_chat_debug())
DEBUG(100, ("expect: sending [%s]\n", issue));
@@ -269,7 +270,6 @@ static int expect(int master, char *issue, char *expected)
buffer[nread] = 0;
while (True) {
- NTSTATUS status;
status = read_socket_with_timeout(
master, buffer + nread, 1,
sizeof(buffer) - nread - 1,
@@ -305,8 +305,8 @@ static int expect(int master, char *issue, char *expected)
if (match)
break;
- if (len < 0) {
- DEBUG(2, ("expect: %s\n", strerror(errno)));
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(2, ("expect: %s\n", nt_errstr(status)));
return False;
}
}