[Gpg4win-commits] r1322 - in trunk: . patches/gpgme-1.2.0

[scm-commit@wald.intevation.org]

Author: werner
Date: 2010-01-25 15:18:54 +0100 (Mon, 25 Jan 2010)
New Revision: 1322

Modified:
   trunk/ChangeLog
   trunk/patches/gpgme-1.2.0/03-w32-socket.patch
Log:
Patch last patch.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-01-25 08:19:56 UTC (rev 1321)
+++ trunk/ChangeLog	2010-01-25 14:18:54 UTC (rev 1322)
@@ -1,3 +1,7 @@
+2010-01-25  Werner Koch  <wk at g10code.com>
+
+	* patches/gpgme-1.2.0/03-w32-socket.patch: Fix patch.
+
 2010-01-22  Werner Koch  <wk at g10code.com>
 
 	* patches/gpgme-1.2.0/03-w32-socket.patch: New.

Modified: trunk/patches/gpgme-1.2.0/03-w32-socket.patch
===================================================================
--- trunk/patches/gpgme-1.2.0/03-w32-socket.patch	2010-01-25 08:19:56 UTC (rev 1321)
+++ trunk/patches/gpgme-1.2.0/03-w32-socket.patch	2010-01-25 14:18:54 UTC (rev 1322)
@@ -6,6 +6,7 @@
 
 	* w32-io.c (writer): Try to use send first.
 	(reader): Try to use recv first.
+        (_gpgme_io_connect): Fix return code check to make it work.
 
 
 --- src/w32-io.c	(revision 1445)
@@ -146,4 +147,13 @@
        TRACE_LOG1 ("wrote %d bytes", (int) nwritten);
        
        LOCK (ctx->mutex);
+@@ -1563,7 +1620,7 @@
+              "addr=%p, addrlen=%i", addr, addrlen);
+ 
+   res = connect (fd, addr, addrlen);
+-  if (!res)
++  if (res)
+     {
+       errno = wsa2errno (WSAGetLastError ());
+       return TRACE_SYSRES (-1);