summaryrefslogtreecommitdiff
path: root/libexec/ftpd/ftpcmd.y
diff options
context:
space:
mode:
authorMoritz Jodeit <moritz@cvs.openbsd.org>2004-12-03 23:57:41 +0000
committerMoritz Jodeit <moritz@cvs.openbsd.org>2004-12-03 23:57:41 +0000
commitfae7ab50e9f9173b6178f0f637a9cb327ec548bf (patch)
tree673db9f7a09a4b7a46b6bd6bb36143831621a957 /libexec/ftpd/ftpcmd.y
parentb4e6fa2090f102b7fc6838056c2df31358d83d4e (diff)
make reply() reentrant. fixes a signal race.
ok henning@
Diffstat (limited to 'libexec/ftpd/ftpcmd.y')
-rw-r--r--libexec/ftpd/ftpcmd.y5
1 files changed, 2 insertions, 3 deletions
diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index c4673356199..1f2ab22fdb5 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftpcmd.y,v 1.44 2004/11/28 18:49:29 henning Exp $ */
+/* $OpenBSD: ftpcmd.y,v 1.45 2004/12/03 23:57:40 moritz 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.44 2004/11/28 18:49:29 henning Exp $";
+ "$OpenBSD: ftpcmd.y,v 1.45 2004/12/03 23:57:40 moritz Exp $";
#endif
#endif /* not lint */
@@ -1170,7 +1170,6 @@ toolong(signo)
{
struct syslog_data sdata = SYSLOG_DATA_INIT;
- /* XXX signal races */
reply(421,
"Timeout (%d seconds): closing control connection.", timeout);
if (logging)