[dovecot-cvs] dovecot/src/login-common ssl-proxy-openssl.c, 1.37.2.9, 1.37.2.10

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/login-common
In directory talvi:/tmp/cvs-serv1095/login-common

Modified Files:
      Tag: branch_1_0
	ssl-proxy-openssl.c 
Log Message:
New asserts / cleanup



Index: ssl-proxy-openssl.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/login-common/ssl-proxy-openssl.c,v
retrieving revision 1.37.2.9
retrieving revision 1.37.2.10
diff -u -d -r1.37.2.9 -r1.37.2.10
--- ssl-proxy-openssl.c	16 Aug 2006 12:16:24 -0000	1.37.2.9
+++ ssl-proxy-openssl.c	13 Oct 2006 20:06:43 -0000	1.37.2.10
@@ -454,6 +454,8 @@
 	SSL *ssl;
 	int sfd[2];
 
+	i_assert(fd != -1);
+
 	*proxy_r = NULL;
 
 	if (!ssl_initialized) {
@@ -475,7 +477,7 @@
 		return -1;
 	}
 
-	if (socketpair(AF_UNIX, SOCK_STREAM, 0, sfd) == -1) {
+	if (socketpair(AF_UNIX, SOCK_STREAM, 0, sfd) < 0) {
 		i_error("socketpair() failed: %m");
 		SSL_free(ssl);
 		return -1;