security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-01 16:33:02 +01:00
Code Activity

Do not try to remove the enclosing directory of sockets.

Browse Source 
* agent/gpg-agent.c (remove_socket): Do not remove the enclosing
directory.
* scd/scdaemon.c (cleanup): Ditto.

--

The socket directory is now below /run or at ~/.gnupg.  Thus we should
not try to remove the directory of the socket.  The auto-removal was
introduced at a time we used a temporary directory for the sockets.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-06-08 09:04:29 +02:00
parent 36550dde99
commit 0faf895154
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
agent/gpg-agent.c
View File

@ -1,6 +1,6 @@
/* gpg-agent.c - The GnuPG Agent
* Copyright (C) 2000-2007, 2009-2010 Free Software Foundation, Inc.
* Copyright (C) 2000-2014 Werner Koch
* Copyright (C) 2000-2016 Werner Koch
*
* This file is part of GnuPG.
*
@ -561,13 +561,6 @@ remove_socket (char *name, char *redir_name)
name = redir_name;
gnupg_remove (name);
p = strrchr (name, '/');
if (p)
{
*p = 0;
rmdir (name);
*p = '/';
}
*name = 0;
}
}

7
scd/scdaemon.c
View File

@ -376,13 +376,6 @@ cleanup (void)
name = redir_socket_name? redir_socket_name : socket_name;
gnupg_remove (name);
p = strrchr (name, '/');
if (p)
{
*p = 0;
rmdir (name);
*p = '/';
}
*socket_name = 0;
}
}