diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2011-05-17 16:32:59 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2011-05-17 16:32:59 +0000 |
| commit | e0c7be3d00700d446aaca5328e91f2b18c9beb1f (patch) | |
| tree | 361376449793f399c92ed552ba04d38b7f433a9f /usr.sbin/smtpd | |
| parent | 9057e22929148375d4936129e6eef9480735d44a (diff) | |
somehow a previous sync with relayd missed one line...
if a ssl_connect() call needs to retry because of SSL_WANT_READ or
SSL_WANT_WRITE, set the proper event flag instead of keeping the default
one which is both read and write.
Diffstat (limited to 'usr.sbin/smtpd')
| -rw-r--r-- | usr.sbin/smtpd/ssl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/smtpd/ssl.c b/usr.sbin/smtpd/ssl.c index 8441230ce8a..953287ceec3 100644 --- a/usr.sbin/smtpd/ssl.c +++ b/usr.sbin/smtpd/ssl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl.c,v 1.34 2011/05/14 11:08:23 gilles Exp $ */ +/* $OpenBSD: ssl.c,v 1.35 2011/05/17 16:32:58 gilles Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -117,6 +117,7 @@ ssl_connect(int fd, short event, void *p) return; retry: + event_set(&s->s_ev, s->s_fd, EV_TIMEOUT|retry_flag, ssl_connect, s); event_add(&s->s_ev, &s->s_tv); } |