[git] GnuPG - branch, master, updated. gnupg-2.1.15-187-g80cc16e
by Werner Koch
cvs at cvs.gnupg.org
Fri Sep 30 19:25:29 CEST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via 80cc16e0728256f6b07a12980e1f3512cf2324fa (commit)
via 95cf7afff074613825f4442fa131145a2c0d3cf7 (commit)
via de67055aff916455cec89fab1d95177d3b383008 (commit)
from 6054e8aaecbd355bb7559697eecaadf2225189b8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 80cc16e0728256f6b07a12980e1f3512cf2324fa
Author: Werner Koch <wk at gnupg.org>
Date: Fri Sep 30 19:21:51 2016 +0200
agent: Create the extra sockets in the standard socket dir.
* agent/gpg-agent.c (main): Take the socketdir in account for the
default sockets.
* tools/gpgconf.c (list_dirs): Add "agent-extra-socket" and
"agent-browser-socket".
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index d3f203b..15202ac 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -1047,8 +1047,7 @@ main (int argc, char **argv )
if (! opt.extra_socket)
{
- opt.extra_socket = 1; /* (1 = points into r/o section) */
- socket_name_extra = GPG_AGENT_EXTRA_SOCK_NAME;
+ opt.extra_socket = 1;
}
else if (socket_name_extra
&& (!strcmp (socket_name_extra, "none")
@@ -1061,8 +1060,7 @@ main (int argc, char **argv )
if (! opt.browser_socket)
{
- opt.browser_socket = 1; /* (1 = points into r/o section) */
- socket_name_browser = GPG_AGENT_BROWSER_SOCK_NAME;
+ opt.browser_socket = 1;
}
else if (socket_name_browser
&& (!strcmp (socket_name_browser, "none")
@@ -1253,7 +1251,11 @@ main (int argc, char **argv )
if (opt.extra_socket)
{
- socket_name_extra = create_socket_name (socket_name_extra, 0);
+ if (socket_name_extra)
+ socket_name_extra = create_socket_name (socket_name_extra, 0);
+ else
+ socket_name_extra = create_socket_name
+ /**/ (GPG_AGENT_EXTRA_SOCK_NAME, 1);
opt.extra_socket = 2; /* Indicate that it has been malloced. */
fd_extra = create_server_socket (socket_name_extra, 0, 0,
&redir_socket_name_extra,
@@ -1262,7 +1264,11 @@ main (int argc, char **argv )
if (opt.browser_socket)
{
- socket_name_browser = create_socket_name (socket_name_browser, 0);
+ if (socket_name_browser)
+ socket_name_browser = create_socket_name (socket_name_browser, 0);
+ else
+ socket_name_browser= create_socket_name
+ /**/ (GPG_AGENT_BROWSER_SOCK_NAME, 1);
opt.browser_socket = 2; /* Indicate that it has been malloced. */
fd_browser = create_server_socket (socket_name_browser, 0, 0,
&redir_socket_name_browser,
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index bdebadb..a1ca79f 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -166,6 +166,8 @@ list_dirs (estream_t fp, char **names)
{ "socketdir", gnupg_socketdir, NULL },
{ "dirmngr-socket", dirmngr_socket_name, NULL,},
{ "agent-ssh-socket", gnupg_socketdir, GPG_AGENT_SSH_SOCK_NAME },
+ { "agent-extra-socket", gnupg_socketdir, GPG_AGENT_EXTRA_SOCK_NAME },
+ { "agent-browser-socket",gnupg_socketdir, GPG_AGENT_BROWSER_SOCK_NAME },
{ "agent-socket", gnupg_socketdir, GPG_AGENT_SOCK_NAME },
{ "homedir", gnupg_homedir, NULL }
};
commit 95cf7afff074613825f4442fa131145a2c0d3cf7
Author: Werner Koch <wk at gnupg.org>
Date: Fri Sep 30 18:49:16 2016 +0200
agent: Kludge to allow disabling of the extra sockets.
* agent/gpg-agent.c (main): Check for special socket names.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 4dda44c..d3f203b 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -1050,12 +1050,28 @@ main (int argc, char **argv )
opt.extra_socket = 1; /* (1 = points into r/o section) */
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)
{
opt.browser_socket = 1; /* (1 = points into r/o section) */
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 ();
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 8d86add..0bb7db2 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -537,8 +537,9 @@ pinentry to pop up at the @code{tty} or display you started the agent.
@anchor{option --extra-socket}
@item --extra-socket @var{name}
@opindex extra-socket
-The extra socket is always created, you may use this option to change
-the name of the socket.
+The extra socket is created by default, you may use this option to
+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
intended use for this extra socket is to setup a Unix domain socket
commit de67055aff916455cec89fab1d95177d3b383008
Author: Werner Koch <wk at gnupg.org>
Date: Fri Sep 30 16:58:10 2016 +0200
wks: Avoid long trustdb checks.
* tools/wks-receive.c (verify_signature): Use --always-trust.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/tools/wks-receive.c b/tools/wks-receive.c
index 0deca9b..7292cff 100644
--- a/tools/wks-receive.c
+++ b/tools/wks-receive.c
@@ -164,6 +164,7 @@ verify_signature (receive_ctx_t ctx)
ccparray_put (&ccp, "--verbose");
ccparray_put (&ccp, "--enable-special-filenames");
ccparray_put (&ccp, "--status-fd=2");
+ ccparray_put (&ccp, "--always-trust"); /* To avoid trustdb checks. */
ccparray_put (&ccp, "--verify");
ccparray_put (&ccp, "--");
ccparray_put (&ccp, "-&@INEXTRA@");
-----------------------------------------------------------------------
Summary of changes:
agent/gpg-agent.c | 34 ++++++++++++++++++++++++++++------
doc/gpg-agent.texi | 5 +++--
tools/gpgconf.c | 2 ++
tools/wks-receive.c | 1 +
4 files changed, 34 insertions(+), 8 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list