dovecot-2.0-sslstream: ssl: Improved error message logging.
dovecot at dovecot.org
dovecot at dovecot.org
Sat Feb 13 02:55:51 EET 2010
details: http://hg.dovecot.org/dovecot-2.0-sslstream/rev/09fe6d98cf98
changeset: 10222:09fe6d98cf98
user: Timo Sirainen <tss at iki.fi>
date: Wed Oct 28 20:53:21 2009 -0400
description:
ssl: Improved error message logging.
diffstat:
1 file changed, 26 insertions(+), 9 deletions(-)
src/login-common/ssl-proxy-openssl.c | 35 +++++++++++++++++++++++++---------
diffs (53 lines):
diff -r a90d9bb6fec3 -r 09fe6d98cf98 src/login-common/ssl-proxy-openssl.c
--- a/src/login-common/ssl-proxy-openssl.c Wed Oct 28 18:35:29 2009 -0400
+++ b/src/login-common/ssl-proxy-openssl.c Wed Oct 28 20:53:21 2009 -0400
@@ -301,23 +301,40 @@ static void plain_write(struct ssl_proxy
ssl_proxy_unref(proxy);
}
-static const char *ssl_last_error(void)
-{
- unsigned long err;
+static const char *ssl_err2str(unsigned long err, const char *data, int flags)
+{
+ const char *ret;
char *buf;
size_t err_size = 256;
- err = ERR_get_error();
+ buf = t_malloc(err_size);
+ buf[err_size-1] = '\0';
+ ERR_error_string_n(err, buf, err_size-1);
+ ret = buf;
+
+ if ((flags & ERR_TXT_STRING) != 0)
+ ret = t_strdup_printf("%s: %s", buf, data);
+ return ret;
+}
+
+static const char *ssl_last_error(void)
+{
+ unsigned long err, err2;
+ const char *data;
+ int flags;
+
+ err = ERR_get_error_line_data(NULL, NULL, &data, &flags);
+ while (err != 0 && (err2 = ERR_peek_error()) != 0) {
+ i_error("SSL: Stacked error: %s",
+ ssl_err2str(err, data, flags));
+ err = ERR_get_error();
+ }
if (err == 0) {
if (errno != 0)
return strerror(errno);
return "Unknown error";
}
-
- buf = t_malloc(err_size);
- buf[err_size-1] = '\0';
- ERR_error_string_n(err, buf, err_size-1);
- return buf;
+ return ssl_err2str(err, data, flags);
}
static void ssl_handle_error(struct ssl_proxy *proxy, int ret,
More information about the dovecot-cvs
mailing list