Fix post-rebase merge issues.

[users/heiko/exim.git] / src / src / tls.c

diff --git a/src/src/tls.c b/src/src/tls.c
index 0c98aeba96c4d6cae0e071a5695243f9f2fb8b7d..0625c48b84d93dda9c3f08aa852b9a4b876f3385 100644 (file)
--- a/src/src/tls.c
+++ b/src/src/tls.c
@@ -86,11 +86,11 @@ return TRUE;
 #ifdef USE_GNUTLS
 #include "tls-gnu.c"
 
 #ifdef USE_GNUTLS
 #include "tls-gnu.c"
 

-#define ssl_xfer_buffer (current_global_tls_state->xfer_buffer)
-#define ssl_xfer_buffer_lwm (current_global_tls_state->xfer_buffer_lwm)
-#define ssl_xfer_buffer_hwm (current_global_tls_state->xfer_buffer_hwm)
-#define ssl_xfer_eof (current_global_tls_state->xfer_eof)
-#define ssl_xfer_error (current_global_tls_state->xfer_error)
+#define ssl_xfer_buffer (state_server.xfer_buffer)
+#define ssl_xfer_buffer_lwm (state_server.xfer_buffer_lwm)
+#define ssl_xfer_buffer_hwm (state_server.xfer_buffer_hwm)
+#define ssl_xfer_eof (state_server.xfer_eof)
+#define ssl_xfer_error (state_server.xfer_error)

 
 #else
 #include "tls-openssl.c"
 
 #else
 #include "tls-openssl.c"


@@ -104,6 +104,7 @@ return TRUE;
 
 /* Puts a character back in the input buffer. Only ever
 called once.
 
 /* Puts a character back in the input buffer. Only ever
 called once.

+Only used by the server-side TLS.

 
 Arguments:
   ch           the character
 
 Arguments:
   ch           the character


@@ -125,6 +126,7 @@ return ch;
 *************************************************/
 
 /* Tests for a previous EOF
 *************************************************/
 
 /* Tests for a previous EOF

+Only used by the server-side TLS.

 
 Arguments:     none
 Returns:       non-zero if the eof flag is set
 
 Arguments:     none
 Returns:       non-zero if the eof flag is set


@@ -144,6 +146,7 @@ return ssl_xfer_eof;
 
 /* Tests for a previous read error, and returns with errno
 restored to what it was when the error was detected.
 
 /* Tests for a previous read error, and returns with errno
 restored to what it was when the error was detected.

+Only used by the server-side TLS.

 
 >>>>> Hmm. Errno not handled yet. Where do we get it from?  >>>>>
 
 
 >>>>> Hmm. Errno not handled yet. Where do we get it from?  >>>>>
 


@@ -163,6 +166,7 @@ return ssl_xfer_error;
 *************************************************/
 
 /* Tests for unused chars in the TLS input buffer.
 *************************************************/
 
 /* Tests for unused chars in the TLS input buffer.

+Only used by the server-side TLS.

 
 Arguments:     none
 Returns:       TRUE/FALSE
 
 Arguments:     none
 Returns:       TRUE/FALSE