[svn] dirmngr - r333 - trunk/src

[svn author marcus]

Author: marcus
Date: 2009-12-08 05:22:38 +0100 (Tue, 08 Dec 2009)
New Revision: 333

Modified:
   trunk/src/ChangeLog
   trunk/src/dirmngr-client.c
Log:
2009-12-08  Marcus Brinkmann  <marcus at g10code.de>

	* dirmngr-client.c (start_dirmngr): Convert posix FDs to assuan fds.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2009-11-25 17:56:31 UTC (rev 332)
+++ trunk/src/ChangeLog	2009-12-08 04:22:38 UTC (rev 333)
@@ -1,3 +1,7 @@
+2009-12-08  Marcus Brinkmann  <marcus at g10code.de>
+
+	* dirmngr-client.c (start_dirmngr): Convert posix FDs to assuan fds.
+
 2009-11-25  Marcus Brinkmann  <marcus at g10code.de>
 
 	* server.c (start_command_handler): Use assuan_fd_t and

Modified: trunk/src/dirmngr-client.c
===================================================================
--- trunk/src/dirmngr-client.c	2009-11-25 17:56:31 UTC (rev 332)
+++ trunk/src/dirmngr-client.c	2009-12-08 04:22:38 UTC (rev 333)
@@ -499,8 +499,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.  */