From 82c03024c274943cb33bb429eb76e598b75680d2 Mon Sep 17 00:00:00 2001 From: Yaroslav Tykhiy Date: Thu, 18 Nov 2004 11:27:31 +0000 Subject: Fix perror_reply() vs. reply() usage. --- libexec/ftpd/ftpcmd.y | 3 +-- libexec/ftpd/ftpd.c | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'libexec') diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y index 05086e391bd1..3b0f8406ede6 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 e98fde543804..029f12d76188 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.", -- cgit v1.3