mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-29 10:18:30 +00:00
Revert r446735 and unbreak, the patch fails to apply and is probably wrong
PR: 218590 Reported by: pkg-fallout
This commit is contained in:
parent
e34a4b86bb
commit
944577e102
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=446810
@ -1,26 +0,0 @@
|
||||
--- qmail-remote.c.orig 2017-05-14 13:50:09 UTC
|
||||
+++ qmail-remote.c
|
||||
@@ -266,7 +266,7 @@ char *append;
|
||||
{
|
||||
#ifdef TLS
|
||||
/* shouldn't talk to the client unless in an appropriate state */
|
||||
- int state = ssl ? ssl->state : SSL_ST_BEFORE;
|
||||
+ int state = SSL_get_state(ssl);
|
||||
if (state & SSL_ST_OK || (!smtps && state & SSL_ST_BEFORE))
|
||||
#endif
|
||||
substdio_putsflush(&smtpto,"QUIT\r\n");
|
||||
--- ssl_timeoutio.c.orig 2017-05-14 13:50:09 UTC
|
||||
+++ ssl_timeoutio.c
|
||||
@@ -74,10 +74,10 @@ int ssl_timeoutrehandshake(int t, int rf
|
||||
|
||||
SSL_renegotiate(ssl);
|
||||
r = ssl_timeoutio(SSL_do_handshake, t, rfd, wfd, ssl, NULL, 0);
|
||||
- if (r <= 0 || ssl->type == SSL_ST_CONNECT) return r;
|
||||
+ if (r <= 0 || SSL_get_state(ssl) == SSL_ST_CONNECT) return r;
|
||||
|
||||
/* this is for the server only */
|
||||
- ssl->state = SSL_ST_ACCEPT;
|
||||
+ SSL_set_accept_state(ssl);
|
||||
return ssl_timeoutio(SSL_do_handshake, t, rfd, wfd, ssl, NULL, 0);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user