summaryrefslogtreecommitdiffstats
path: root/libexec/ftpd
diff options
context:
space:
mode:
authoryar <yar@FreeBSD.org>2004-11-18 11:27:31 +0000
committeryar <yar@FreeBSD.org>2004-11-18 11:27:31 +0000
commita6025b1cf112acb2351e4036d4ef3c75f6df07f3 (patch)
tree220b810ef980265ca219f797c0af15d79813e235 /libexec/ftpd
parent3851ed3f4f751a27179023592a684af66b6ffc9f (diff)
downloadFreeBSD-src-a6025b1cf112acb2351e4036d4ef3c75f6df07f3.zip
FreeBSD-src-a6025b1cf112acb2351e4036d4ef3c75f6df07f3.tar.gz
Fix perror_reply() vs. reply() usage.
Diffstat (limited to 'libexec/ftpd')
-rw-r--r--libexec/ftpd/ftpcmd.y3
-rw-r--r--libexec/ftpd/ftpd.c3
2 files changed, 3 insertions, 3 deletions
diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index 05086e3..3b0f840 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -731,8 +731,7 @@ cmd
if ($2 && $4 != NULL) {
struct stat stbuf;
if (stat($4, &stbuf) < 0)
- reply(550, "%s: %s",
- $4, strerror(errno));
+ perror_reply(550, $4);
else if (!S_ISREG(stbuf.st_mode)) {
reply(550, "%s: not a plain file.", $4);
} else {
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index e98fde5..029f12d 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -1962,7 +1962,8 @@ pdata_err:
}
} while (retry <= swaitmax);
if (conerrno != 0) {
- perror_reply(425, "Can't build data connection");
+ reply(425, "Can't build data connection: %s.",
+ strerror(conerrno));
return (NULL);
}
reply(150, "Opening %s mode data connection for '%s'%s.",
OpenPOWER on IntegriCloud