[svn] GnuPG - r5322 - trunk/agent

[svn author wk]

Author: wk
Date: 2010-04-26 16:51:38 +0200 (Mon, 26 Apr 2010)
New Revision: 5322

Modified:
   trunk/agent/ChangeLog
   trunk/agent/gpg-agent.c
Log:
Ignore a stale agent socket.


Modified: trunk/agent/ChangeLog
===================================================================
--- trunk/agent/ChangeLog	2010-04-26 11:53:14 UTC (rev 5321)
+++ trunk/agent/ChangeLog	2010-04-26 14:51:38 UTC (rev 5322)
@@ -1,3 +1,7 @@
+2010-04-26  Werner Koch  <wk at g10code.com>
+
+	* gpg-agent.c (create_server_socket) [W32]: Also check for EEXIST.
+
 2010-04-19  Werner Koch  <wk at g10code.com>
 
 	* pksign.c (get_dsa_qbits, do_encode_dsa): New.

Modified: trunk/agent/gpg-agent.c
===================================================================
--- trunk/agent/gpg-agent.c	2010-04-26 11:53:14 UTC (rev 5321)
+++ trunk/agent/gpg-agent.c	2010-04-26 14:51:38 UTC (rev 5322)
@@ -1493,7 +1493,15 @@
   strcpy (serv_addr->sun_path, name);
   len = SUN_LEN (serv_addr);
   rc = assuan_sock_bind (fd, (struct sockaddr*) serv_addr, len);
-  if (use_standard_socket && rc == -1 && errno == EADDRINUSE)
+
+  /* Our error code mapping on W32CE returns EEXIST thus we also test
+     for this. */
+  if (use_standard_socket && rc == -1 
+      && (errno == EADDRINUSE
+#ifdef HAVE_W32_SYSTEM
+          || errno == EEXIST
+#endif
+          ))
     {
       /* Check whether a gpg-agent is already running on the standard
          socket.  We do this test only if this is not the ssh socket.