security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

Honor TMPDIR.

Browse source
This commit is contained in:
Werner Koch 2010-10-27 07:37:52 +00:00
parent 0f721abddf
commit dc5150db78
8 changed files with 51 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
agent/gpg-agent.c
View file

@ -1026,10 +1026,10 @@ main (int argc, char **argv )
/* Create the sockets. */
socket_name = create_socket_name
("S.gpg-agent", "/tmp/gpg-XXXXXX/S.gpg-agent");
("S.gpg-agent", "gpg-XXXXXX/S.gpg-agent");
if (opt.ssh_support)
socket_name_ssh = create_socket_name
("S.gpg-agent.ssh", "/tmp/gpg-XXXXXX/S.gpg-agent.ssh");
("S.gpg-agent.ssh", "gpg-XXXXXX/S.gpg-agent.ssh");
fd = create_server_socket (socket_name, 0, &socket_nonce);
if (opt.ssh_support)
@ -1446,7 +1446,15 @@ create_socket_name (char *standard_name, char *template)
name = make_filename (opt.homedir, standard_name, NULL);
else
{
name = xstrdup (template);
/* Prepend the tmp directory to the template. */
p = getenv ("TMPDIR");
if (!p || !*p)
p = "/tmp";
if (p[strlen (p) - 1] == '/')
name = xstrconcat (p, template, NULL);
else
name = xstrconcat (p, "/", template, NULL);
p = strrchr (name, '/');
if (!p)
BUG ();