summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorCamiel Dobbelaar <camield@cvs.openbsd.org>2005-11-18 08:49:33 +0000
committerCamiel Dobbelaar <camield@cvs.openbsd.org>2005-11-18 08:49:33 +0000
commitd59d1090f05fa4a99511418b78099454d378cee7 (patch)
tree018f4c7f3b1c944ff980393c2fe43bea674ee6c2 /usr.sbin
parent8620825e8febd077391d828f94021b6ff2aa1147 (diff)
don't assume that close() can fail, from deraadt
ok henning deraadt
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/ftp-proxy/ftp-proxy.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.sbin/ftp-proxy/ftp-proxy.c b/usr.sbin/ftp-proxy/ftp-proxy.c
index faf0b77c16b..4a195571274 100644
--- a/usr.sbin/ftp-proxy/ftp-proxy.c
+++ b/usr.sbin/ftp-proxy/ftp-proxy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftp-proxy.c,v 1.6 2005/11/17 13:32:05 deraadt Exp $ */
+/* $OpenBSD: ftp-proxy.c,v 1.7 2005/11/18 08:49:32 camield Exp $ */
/*
* Copyright (c) 2004, 2005 Camiel Dobbelaar, <cd@sentia.nl>
@@ -293,11 +293,9 @@ end_session(struct session *s)
bufferevent_free(s->server_bufev);
if (s->client_fd != -1)
- while (close(s->client_fd) != 0 && errno == EINTR)
- ;
+ close(s->client_fd);
if (s->server_fd != -1)
- while (close(s->server_fd) != 0 && errno == EINTR)
- ;
+ close(s->server_fd);
/* Remove rulesets by commiting empty ones. */
err = 0;