[svn] GnuPG - r4585 - trunk/scd

[svn author marcus]

Author: marcus
Date: 2007-09-14 19:23:34 +0200 (Fri, 14 Sep 2007)
New Revision: 4585

Modified:
   trunk/scd/ChangeLog
   trunk/scd/scdaemon.c
Log:
2007-09-14  Marcus Brinkmann  <marcus at g10code.de>

	* scdaemon.c (main): New variable STANDARD_SOCKET, which is 1 for
	W32 targets.  Use it for create_socket_name.


Modified: trunk/scd/ChangeLog
===================================================================
--- trunk/scd/ChangeLog	2007-09-14 14:25:02 UTC (rev 4584)
+++ trunk/scd/ChangeLog	2007-09-14 17:23:34 UTC (rev 4585)
@@ -1,3 +1,8 @@
+2007-09-14  Marcus Brinkmann  <marcus at g10code.de>
+
+	* scdaemon.c (main): New variable STANDARD_SOCKET, which is 1 for
+	W32 targets.  Use it for create_socket_name.
+
 2007-08-07  Werner Koch  <wk at g10code.com>
 
 	* tlv.c, tlv.h:  Move to ../common/.

Modified: trunk/scd/scdaemon.c
===================================================================
--- trunk/scd/scdaemon.c	2007-09-14 14:25:02 UTC (rev 4584)
+++ trunk/scd/scdaemon.c	2007-09-14 17:23:34 UTC (rev 4585)
@@ -310,6 +310,7 @@
   int gpgconf_list = 0;
   const char *config_filename = NULL;
   int allow_coredump = 0;
+  int standard_socket = 0;
 
   set_strusage (my_strusage);
   gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN);
@@ -356,7 +357,12 @@
   /* Set default options. */
   opt.pcsc_driver = DEFAULT_PCSC_DRIVER; 
 
+#ifdef HAVE_W32_SYSTEM
+  standard_socket = 1;  /* Under Windows we always use a standard
+                           socket.  */
+#endif
 
+
   shell = getenv ("SHELL");
   if (shell && strlen (shell) >= 3 && !strcmp (shell+strlen (shell)-3, "csh") )
     csh_style = 1;
@@ -621,7 +627,7 @@
          back the name of that socket. */
       if (multi_server)
         {
-          socket_name = create_socket_name (0,
+          socket_name = create_socket_name (standard_socket,
                                             "S.scdaemon",
                                             "/tmp/gpg-XXXXXX/S.scdaemon");
           
@@ -665,7 +671,7 @@
       int i;
 
       /* Create the socket.  */
-      socket_name = create_socket_name (0,
+      socket_name = create_socket_name (standard_socket,
                                         "S.scdaemon",
                                         "/tmp/gpg-XXXXXX/S.scdaemon");