[commit] 1.3: re-nest conditions in socket_fd_cb()

[Oswald Buddenhagen via isync-devel]

commit 5f01858c3bb291cc2b3ad4cb1d49a4d857d3bf27
Author: Oswald Buddenhagen <o...@users.sf.net>
Date:   Sat Nov 16 14:17:06 2019 +0100

    re-nest conditions in socket_fd_cb()
    
    conn->state == SCK_STARTTLS implies conn->ssl != NULL.

 src/socket.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/socket.c b/src/socket.c
index b8796cb..ac81870 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -1064,11 +1064,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 );


_______________________________________________
isync-devel mailing list
isync-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/isync-devel