isync

commit 8a03651dd8a40afd0ac520fc3e6dcd228db24ca3
parent 21179458385aa576da53cce7a0d88b9eaefddd91
Author: Oswald Buddenhagen <ossi@users.sf.net>
Date:   Sat, 16 Nov 2019 14:17:06 +0100

re-nest conditions in socket_fd_cb()

conn->state == SCK_STARTTLS implies conn->ssl != NULL.

Diffstat:
M
src/socket.c
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/socket.c b/src/socket.c
@@ -1063,11 +1063,11 @@ socket_fd_cb( int events, void *aux )
 		conf_wakeup( &conn->fd_timeout, conn->conf->timeout );
 
 #ifdef HAVE_LIBSSL
-	if (conn->state == SCK_STARTTLS) {
-		start_tls_p2( conn );
-		return;
-	}
 	if (conn->ssl) {
+		if (conn->state == SCK_STARTTLS) {
+			start_tls_p2( conn );
+			return;
+		}
 		if (do_queued_write( conn ) < 0)
 			return;
 		socket_fill( conn );