diff options
author | Gilles Chehade <gilles@poolp.org> | 2019-10-03 09:04:43 +0200 |
---|---|---|
committer | Gilles Chehade <gilles@poolp.org> | 2019-10-03 09:04:43 +0200 |
commit | 9180708b3ba3a2cd7f41fdf6251edea25fb137fc (patch) | |
tree | 4175d66052fa596a9fee9246da9bc4ac40bf7514 | |
parent | Merge branch 'master' into portable (diff) | |
parent | sync (diff) | |
download | OpenSMTPD-9180708b3ba3a2cd7f41fdf6251edea25fb137fc.tar.xz OpenSMTPD-9180708b3ba3a2cd7f41fdf6251edea25fb137fc.zip |
Merge branch 'master' into portable
-rw-r--r-- | smtpd/iobuf.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/smtpd/iobuf.c b/smtpd/iobuf.c index 31a410c1..ceb2ac01 100644 --- a/smtpd/iobuf.c +++ b/smtpd/iobuf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iobuf.c,v 1.11 2019/06/12 17:42:53 eric Exp $ */ +/* $OpenBSD: iobuf.c,v 1.12 2019/10/03 07:03:23 gilles Exp $ */ /* * Copyright (c) 2012 Eric Faurot <eric@openbsd.org> * @@ -422,8 +422,6 @@ iobuf_write_tls(struct iobuf *io, void *tls) case SSL_ERROR_SYSCALL: if (ERR_peek_last_error()) return (IOBUF_TLSERROR); - if (r == 0) - errno = EPIPE; return (IOBUF_ERROR); default: return (IOBUF_TLSERROR); @@ -450,8 +448,6 @@ iobuf_read_tls(struct iobuf *io, void *tls) case SSL_ERROR_SYSCALL: if (ERR_peek_last_error()) return (IOBUF_TLSERROR); - if (r == 0) - errno = EPIPE; return (IOBUF_ERROR); default: return (IOBUF_TLSERROR); |