git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Logging: fix syslog logging for syslog_timestamp=no and log_selector +millisec
[exim.git]
/
src
/
src
/
tls.c
diff --git
a/src/src/tls.c
b/src/src/tls.c
index c93eb4579069e36365aba99a222aa3e12bf038b0..f816620659963e9ccfa831164e78f3ea0ae917d7 100644
(file)
--- a/
src/src/tls.c
+++ b/
src/src/tls.c
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 201
6
*/
+/* Copyright (c) University of Cambridge 1995 - 201
8
*/
/* See the file NOTICE for conditions of use and distribution. */
/* This module provides TLS (aka SSL) support for Exim. The code for OpenSSL is
/* See the file NOTICE for conditions of use and distribution. */
/* This module provides TLS (aka SSL) support for Exim. The code for OpenSSL is
@@
-41,8
+41,8
@@
static const int ssl_xfer_buffer_size = 4096;
static uschar *ssl_xfer_buffer = NULL;
static int ssl_xfer_buffer_lwm = 0;
static int ssl_xfer_buffer_hwm = 0;
static uschar *ssl_xfer_buffer = NULL;
static int ssl_xfer_buffer_lwm = 0;
static int ssl_xfer_buffer_hwm = 0;
-static int ssl_xfer_eof =
0
;
-static
int ssl_xfer_error = 0
;
+static int ssl_xfer_eof =
FALSE
;
+static
BOOL ssl_xfer_error = FALSE
;
#endif
uschar *tls_channelbinding_b64 = NULL;
#endif
uschar *tls_channelbinding_b64 = NULL;
@@
-162,7
+162,7
@@
Returns: non-zero if the eof flag is set
int
tls_feof(void)
{
int
tls_feof(void)
{
-return ssl_xfer_eof;
+return
(int)
ssl_xfer_eof;
}
}
@@
-184,7
+184,7
@@
Returns: non-zero if the error flag is set
int
tls_ferror(void)
{
int
tls_ferror(void)
{
-return ssl_xfer_error;
+return
(int)
ssl_xfer_error;
}
}
@@
-263,8
+263,7
@@
uschar outsep = '\n';
uschar * ele;
uschar * match = NULL;
int len;
uschar * ele;
uschar * match = NULL;
int len;
-uschar * list = NULL;
-int size = 0, pos = 0;
+gstring * list = NULL;
while ((ele = string_nextinlist(&mod, &insep, NULL, 0)))
if (ele[0] != '>')
while ((ele = string_nextinlist(&mod, &insep, NULL, 0)))
if (ele[0] != '>')
@@
-279,8
+278,8
@@
while ((ele = string_nextinlist(CUSS &dn, &insep, NULL, 0)))
if ( !match
|| Ustrncmp(ele, match, len) == 0 && ele[len] == '='
)
if ( !match
|| Ustrncmp(ele, match, len) == 0 && ele[len] == '='
)
- list = string_append_listele(list,
&size, &pos,
outsep, ele+len+1);
-return
list
;
+ list = string_append_listele(list, outsep, ele+len+1);
+return
string_from_gstring(list)
;
}
}