security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-11 22:01:08 +02:00
Code Activity

agent: Kludge to allow disabling of the extra sockets.

Browse Source 
* agent/gpg-agent.c (main): Check for special socket names.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-09-30 18:49:16 +02:00
parent de67055aff
commit 95cf7afff0
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
agent/gpg-agent.c
View File

@ -1050,12 +1050,28 @@ main (int argc, char **argv )
opt.extra_socket = 1; /* (1 = points into r/o section) */ opt.extra_socket = 1; /* (1 = points into r/o section) */
socket_name_extra = GPG_AGENT_EXTRA_SOCK_NAME; socket_name_extra = GPG_AGENT_EXTRA_SOCK_NAME;
} }
else if (socket_name_extra
&& (!strcmp (socket_name_extra, "none")
|| !strcmp (socket_name_extra, "/dev/null")))
{
/* User requested not to create this socket. */
opt.extra_socket = 0;
socket_name_extra = NULL;
}
if (! opt.browser_socket) if (! opt.browser_socket)
{ {
opt.browser_socket = 1; /* (1 = points into r/o section) */ opt.browser_socket = 1; /* (1 = points into r/o section) */
socket_name_browser = GPG_AGENT_BROWSER_SOCK_NAME; socket_name_browser = GPG_AGENT_BROWSER_SOCK_NAME;
} }
else if (socket_name_browser
&& (!strcmp (socket_name_browser, "none")
|| !strcmp (socket_name_browser, "/dev/null")))
{
/* User requested not to create this socket. */
opt.browser_socket = 0;
socket_name_browser = NULL;
}
set_debug (); set_debug ();

5
doc/gpg-agent.texi
View File

@ -537,8 +537,9 @@ pinentry to pop up at the @code{tty} or display you started the agent.
@anchor{option --extra-socket} @anchor{option --extra-socket}
@item --extra-socket @var{name} @item --extra-socket @var{name}
@opindex extra-socket @opindex extra-socket
The extra socket is always created, you may use this option to change The extra socket is created by default, you may use this option to
the name of the socket. change the name of the socket. To disable the creation of the socket
use ``none'' or ``/dev/null'' for @var{name}.
Also listen on native gpg-agent connections on the given socket. The Also listen on native gpg-agent connections on the given socket. The
intended use for this extra socket is to setup a Unix domain socket intended use for this extra socket is to setup a Unix domain socket