Mercurial > dovecot > original-hg > dovecot-1.2

changeset 8986:d475e17d01a3 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ssl-proxy: Crashfix to previous commit.
author Timo Sirainen <tss@iki.fi>
date Wed, 29 Apr 2009 12:40:48 -0400
parents f43bebab3dac
children 0d3b712342d9
files src/login-common/ssl-proxy-openssl.c
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/login-common/ssl-proxy-openssl.c	Tue Apr 28 22:31:40 2009 -0400
+++ b/src/login-common/ssl-proxy-openssl.c	Wed Apr 29 12:40:48 2009 -0400
@@ -50,7 +50,7 @@
 	unsigned int sslout_size;
 
 	ssl_handshake_callback_t *handshake_callback;
-	void *handshake_callback_context;
+	void *handshake_context;
 
 	char *last_error;
 	unsigned int handshaked:1;
@@ -420,8 +420,10 @@
 	ssl_set_io(proxy, SSL_ADD_INPUT);
 	plain_block_input(proxy, FALSE);
 
-	if (proxy->handshake_callback(proxy->handshake_callback_context) < 0)
-		ssl_proxy_destroy(proxy);
+	if (proxy->handshake_callback != NULL) {
+		if (proxy->handshake_callback(proxy->handshake_context) < 0)
+			ssl_proxy_destroy(proxy);
+	}
 }
 
 static void ssl_read(struct ssl_proxy *proxy)
@@ -567,7 +569,7 @@
 		return -1;
 
 	(*proxy_r)->handshake_callback = callback;
-	(*proxy_r)->handshake_callback_context = context;
+	(*proxy_r)->handshake_context = context;
 	(*proxy_r)->client = TRUE;
 	ssl_step(*proxy_r);
 	return ret;