[svn] GnuPG - r5217 - in trunk: agent common g13 sm tools
svn author marcus
cvs at cvs.gnupg.org
Tue Dec 8 05:43:16 CET 2009
Author: marcus
Date: 2009-12-08 05:43:15 +0100 (Tue, 08 Dec 2009)
New Revision: 5217
Modified:
trunk/agent/ChangeLog
trunk/agent/call-pinentry.c
trunk/agent/call-scd.c
trunk/common/ChangeLog
trunk/common/asshelp.c
trunk/g13/call-gpg.c
trunk/sm/ChangeLog
trunk/sm/call-dirmngr.c
trunk/tools/ChangeLog
trunk/tools/gpg-connect-agent.c
Log:
common/
2009-12-08 Marcus Brinkmann <marcus at g10code.de>
* asshelp.c (start_new_gpg_agent): Convert posix FD to assuan FD.
agent/
2009-12-08 Marcus Brinkmann <marcus at g10code.de>
* call-pinentry.c (start_pinentry): Convert posix fd to assuan fd.
* call-scd.c (start_scd): Likewise.
sm/
2009-12-08 Marcus Brinkmann <marcus at g10code.de>
* call-dirmngr.c (start_dirmngr_ext): Convert posix fd to assuan fd.
tools/
2009-12-08 Marcus Brinkmann <marcus at g10code.de>
* gpg-connect-agent.c (main): Convert posix fd to assuan fd.
Modified: trunk/agent/ChangeLog
===================================================================
--- trunk/agent/ChangeLog 2009-12-08 04:09:36 UTC (rev 5216)
+++ trunk/agent/ChangeLog 2009-12-08 04:43:15 UTC (rev 5217)
@@ -1,3 +1,8 @@
+2009-12-08 Marcus Brinkmann <marcus at g10code.de>
+
+ * call-pinentry.c (start_pinentry): Convert posix fd to assuan fd.
+ * call-scd.c (start_scd): Likewise.
+
2009-12-03 Werner Koch <wk at g10code.com>
* gpg-agent.c (set_debug): Allow for numerical debug leveles. Print
Modified: trunk/common/ChangeLog
===================================================================
--- trunk/common/ChangeLog 2009-12-08 04:09:36 UTC (rev 5216)
+++ trunk/common/ChangeLog 2009-12-08 04:43:15 UTC (rev 5217)
@@ -1,5 +1,7 @@
2009-12-08 Marcus Brinkmann <marcus at g10code.de>
+ * asshelp.c (start_new_gpg_agent): Convert posix FD to assuan FD.
+
* asshelp.c (start_new_gpg_agent) [HAVE_W32_SYSTEM]: Add missing
argument in assuan_socket_connect invocation.
* iobuf.c (iobuf_open_fd_or_name): Fix type of FD in function
Modified: trunk/sm/ChangeLog
===================================================================
--- trunk/sm/ChangeLog 2009-12-08 04:09:36 UTC (rev 5216)
+++ trunk/sm/ChangeLog 2009-12-08 04:43:15 UTC (rev 5217)
@@ -1,3 +1,7 @@
+2009-12-08 Marcus Brinkmann <marcus at g10code.de>
+
+ * call-dirmngr.c (start_dirmngr_ext): Convert posix fd to assuan fd.
+
2009-12-03 Werner Koch <wk at g10code.com>
* gpgsm.c (set_debug): Allow for numerical debug leveles. Print
Modified: trunk/tools/ChangeLog
===================================================================
--- trunk/tools/ChangeLog 2009-12-08 04:09:36 UTC (rev 5216)
+++ trunk/tools/ChangeLog 2009-12-08 04:43:15 UTC (rev 5217)
@@ -1,3 +1,7 @@
+2009-12-08 Marcus Brinkmann <marcus at g10code.de>
+
+ * gpg-connect-agent.c (main): Convert posix fd to assuan fd.
+
2009-12-07 Werner Koch <wk at g10code.com>
* no-libgcrypt.c (gcry_strdup): Actually copy the string.
Modified: trunk/agent/call-pinentry.c
===================================================================
--- trunk/agent/call-pinentry.c 2009-12-08 04:09:36 UTC (rev 5216)
+++ trunk/agent/call-pinentry.c 2009-12-08 04:43:15 UTC (rev 5217)
@@ -304,8 +304,8 @@
if (!opt.running_detached)
{
if (log_get_fd () != -1)
- no_close_list[i++] = log_get_fd ();
- no_close_list[i++] = fileno (stderr);
+ no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ());
+ no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr));
}
no_close_list[i] = -1;
Modified: trunk/agent/call-scd.c
===================================================================
--- trunk/agent/call-scd.c 2009-12-08 04:09:36 UTC (rev 5216)
+++ trunk/agent/call-scd.c 2009-12-08 04:43:15 UTC (rev 5217)
@@ -333,8 +333,8 @@
if (!opt.running_detached)
{
if (log_get_fd () != -1)
- no_close_list[i++] = log_get_fd ();
- no_close_list[i++] = fileno (stderr);
+ no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ());
+ no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr));
}
no_close_list[i] = -1;
Modified: trunk/common/asshelp.c
===================================================================
--- trunk/common/asshelp.c 2009-12-08 04:09:36 UTC (rev 5216)
+++ trunk/common/asshelp.c 2009-12-08 04:43:15 UTC (rev 5217)
@@ -268,8 +268,8 @@
i=0;
if (log_get_fd () != -1)
- no_close_list[i++] = log_get_fd ();
- no_close_list[i++] = fileno (stderr);
+ no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ());
+ no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr));
no_close_list[i] = -1;
/* Connect to the agent and perform initial handshaking. */
Modified: trunk/g13/call-gpg.c
===================================================================
--- trunk/g13/call-gpg.c 2009-12-08 04:09:36 UTC (rev 5216)
+++ trunk/g13/call-gpg.c 2009-12-08 04:43:15 UTC (rev 5217)
@@ -92,12 +92,12 @@
i = 0;
if (log_get_fd () != -1)
- no_close_list[i++] = log_get_fd ();
- no_close_list[i++] = fileno (stderr);
+ no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ());
+ no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr));
if (input_fd != -1)
- no_close_list[i++] = input_fd;
+ no_close_list[i++] = assuan_fd_from_posix_fd (input_fd);
if (output_fd != -1)
- no_close_list[i++] = output_fd;
+ no_close_list[i++] = assuan_fd_from_posix_fd (output_fd);
no_close_list[i] = -1;
/* Connect to GPG and perform initial handshaking. */
Modified: trunk/sm/call-dirmngr.c
===================================================================
--- trunk/sm/call-dirmngr.c 2009-12-08 04:09:36 UTC (rev 5216)
+++ trunk/sm/call-dirmngr.c 2009-12-08 04:43:15 UTC (rev 5217)
@@ -258,8 +258,8 @@
i=0;
if (log_get_fd () != -1)
- no_close_list[i++] = log_get_fd ();
- no_close_list[i++] = fileno (stderr);
+ no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ());
+ no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr));
no_close_list[i] = -1;
/* connect to the agent and perform initial handshaking */
Modified: trunk/tools/gpg-connect-agent.c
===================================================================
--- trunk/tools/gpg-connect-agent.c 2009-12-08 04:09:36 UTC (rev 5216)
+++ trunk/tools/gpg-connect-agent.c 2009-12-08 04:43:15 UTC (rev 5217)
@@ -1222,8 +1222,8 @@
{
int no_close[3];
- no_close[0] = fileno (stderr);
- no_close[1] = log_get_fd ();
+ no_close[0] = assuan_fd_from_posix_fd (fileno (stderr));
+ no_close[1] = assuan_fd_from_posix_fd (log_get_fd ());
no_close[2] = -1;
rc = assuan_new (&ctx);
More information about the Gnupg-commits
mailing list