mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-08 12:44:23 +01:00
2007-09-14 Marcus Brinkmann <marcus@g10code.de>
* scdaemon.c (main): New variable STANDARD_SOCKET, which is 1 for W32 targets. Use it for create_socket_name.
This commit is contained in:
parent
58278955a7
commit
1151d4d6ae
@ -1,3 +1,8 @@
|
||||
2007-09-14 Marcus Brinkmann <marcus@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@g10code.com>
|
||||
|
||||
* tlv.c, tlv.h: Move to ../common/.
|
||||
|
@ -310,6 +310,7 @@ main (int argc, char **argv )
|
||||
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,6 +357,11 @@ main (int argc, char **argv )
|
||||
/* 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") )
|
||||
@ -621,7 +627,7 @@ main (int argc, char **argv )
|
||||
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 @@ main (int argc, char **argv )
|
||||
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");
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user