security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-09 12:54:23 +01:00
Code Activity

2007-09-14 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* scdaemon.c (main): New variable STANDARD_SOCKET, which is 1 for
	W32 targets.  Use it for create_socket_name.
This commit is contained in:
Marcus Brinkmann 2007-09-14 17:23:34 +00:00
parent 58278955a7
commit 1151d4d6ae
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scd/ChangeLog
View File

@ -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> 2007-08-07 Werner Koch <wk@g10code.com>
* tlv.c, tlv.h: Move to ../common/. * tlv.c, tlv.h: Move to ../common/.

10
scd/scdaemon.c
View File

@ -310,6 +310,7 @@ main (int argc, char **argv )
int gpgconf_list = 0; int gpgconf_list = 0;
const char *config_filename = NULL; const char *config_filename = NULL;
int allow_coredump = 0; int allow_coredump = 0;
int standard_socket = 0;
set_strusage (my_strusage); set_strusage (my_strusage);
gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN); gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN);
@ -356,6 +357,11 @@ main (int argc, char **argv )
/* Set default options. */ /* Set default options. */
opt.pcsc_driver = DEFAULT_PCSC_DRIVER; 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"); shell = getenv ("SHELL");
if (shell && strlen (shell) >= 3 && !strcmp (shell+strlen (shell)-3, "csh") ) 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. */ back the name of that socket. */
if (multi_server) if (multi_server)
{ {
socket_name = create_socket_name (0, socket_name = create_socket_name (standard_socket,
"S.scdaemon", "S.scdaemon",
"/tmp/gpg-XXXXXX/S.scdaemon"); "/tmp/gpg-XXXXXX/S.scdaemon");
@ -665,7 +671,7 @@ main (int argc, char **argv )
int i; int i;
/* Create the socket. */ /* Create the socket. */
socket_name = create_socket_name (0, socket_name = create_socket_name (standard_socket,
"S.scdaemon", "S.scdaemon",
"/tmp/gpg-XXXXXX/S.scdaemon"); "/tmp/gpg-XXXXXX/S.scdaemon");