summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMarcus Brinkmann <mb@g10code.com>2009-12-08 05:43:15 +0100
committerMarcus Brinkmann <mb@g10code.com>2009-12-08 05:43:15 +0100
commit146a4665bb4a2afcd24f444b4a8da055db715d78 (patch)
tree14e613cf978f26f03a07f7a1d3657da7d18aa513 /tools
parent2009-12-08 Marcus Brinkmann <marcus@g10code.de> (diff)
downloadgnupg2-146a4665bb4a2afcd24f444b4a8da055db715d78.tar.xz
gnupg2-146a4665bb4a2afcd24f444b4a8da055db715d78.zip
common/
2009-12-08 Marcus Brinkmann <marcus@g10code.de> * asshelp.c (start_new_gpg_agent): Convert posix FD to assuan FD. agent/ 2009-12-08 Marcus Brinkmann <marcus@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@g10code.de> * call-dirmngr.c (start_dirmngr_ext): Convert posix fd to assuan fd. tools/ 2009-12-08 Marcus Brinkmann <marcus@g10code.de> * gpg-connect-agent.c (main): Convert posix fd to assuan fd.
Diffstat (limited to 'tools')
-rw-r--r--tools/ChangeLog4
-rw-r--r--tools/gpg-connect-agent.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 02e67f922..b839c4d5e 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-08 Marcus Brinkmann <marcus@g10code.de>
+
+ * gpg-connect-agent.c (main): Convert posix fd to assuan fd.
+
2009-12-07 Werner Koch <wk@g10code.com>
* no-libgcrypt.c (gcry_strdup): Actually copy the string.
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index 895056fe7..4acda0171 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -1222,8 +1222,8 @@ main (int argc, char **argv)
{
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);