diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-12-06 23:04:15 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-12-06 23:04:15 +0000 |
| commit | f41c154ac05ca2876af616579040e3046d65ed70 (patch) | |
| tree | 444670cb824b0a29e0e95bc17195a899769dd266 /libexec/ftpd/ftpcmd.y | |
| parent | 6362781442cf20ec59e6550787b8b741d379fca9 (diff) | |
seperate reply_r, like earlier change but safer; moritz ok
Diffstat (limited to 'libexec/ftpd/ftpcmd.y')
| -rw-r--r-- | libexec/ftpd/ftpcmd.y | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y index 2f774c30882..fc8bfae9d06 100644 --- a/libexec/ftpd/ftpcmd.y +++ b/libexec/ftpd/ftpcmd.y @@ -1,4 +1,4 @@ -/* $OpenBSD: ftpcmd.y,v 1.46 2004/12/04 18:00:43 deraadt Exp $ */ +/* $OpenBSD: ftpcmd.y,v 1.47 2004/12/06 23:04:14 deraadt Exp $ */ /* $NetBSD: ftpcmd.y,v 1.7 1996/04/08 19:03:11 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static const char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94"; #else static const char rcsid[] = - "$OpenBSD: ftpcmd.y,v 1.46 2004/12/04 18:00:43 deraadt Exp $"; + "$OpenBSD: ftpcmd.y,v 1.47 2004/12/06 23:04:14 deraadt Exp $"; #endif #endif /* not lint */ @@ -1170,8 +1170,7 @@ toolong(signo) { struct syslog_data sdata = SYSLOG_DATA_INIT; - /* XXX signal races */ - reply(421, + reply_r(421, "Timeout (%d seconds): closing control connection.", timeout); if (logging) syslog_r(LOG_INFO, &sdata, "User %s timed out after %d seconds", |