agent/

2009-11-25  Marcus Brinkmann  <marcus@g10code.de>

	* command.c (start_command_handler): Use assuan_fd_t and
	assuan_fdopen on fds.

scd/
2009-11-25  Marcus Brinkmann  <marcus@g10code.de>

	* command.c (scd_command_handler): Use assuan_fd_t and
	assuan_fdopen on fds.

sm/
2009-11-25  Marcus Brinkmann  <marcus@g10code.de>

	* server.c (gpgsm_server): Use assuan_fd_t and assuan_fdopen on
	fds.

g10/
2009-11-25  Marcus Brinkmann  <marcus@g10code.de>

	* server.c (gpg_server): Use assuan_fd_t and assuan_fdopen on fds.

9 files changed, 33 insertions, 14 deletions

diff --git a/agent/ChangeLog b/agent/ChangeLog
index cebe3db51..3bb232219 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-25  Marcus Brinkmann  <marcus@g10code.de>
+
+	* command.c (start_command_handler): Use assuan_fd_t and
+	assuan_fdopen on fds.
+
 2009-11-05  Marcus Brinkmann  <marcus@g10code.de>
 
 	* call-pinentry.c (start_pinentry): Call assuan_pipe_connect, not
diff --git a/agent/command.c b/agent/command.c
index 1c0f57467..5d082ed8a 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1916,10 +1916,10 @@ start_command_handler (ctrl_t ctrl, gnupg_fd_t listen_fd, gnupg_fd_t fd)
 
   if (listen_fd == GNUPG_INVALID_FD && fd == GNUPG_INVALID_FD)
     {
-      int filedes[2];
+      assuan_fd_t filedes[2];
 
-      filedes[0] = 0;
-      filedes[1] = 1;
+      filedes[0] = assuan_fdopen (0);
+      filedes[1] = assuan_fdopen (1);
       rc = assuan_init_pipe_server (ctx, filedes);
     }
   else if (listen_fd != GNUPG_INVALID_FD)
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 944326579..c8978f6d5 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-25  Marcus Brinkmann  <marcus@g10code.de>
+
+	* server.c (gpg_server): Use assuan_fd_t and assuan_fdopen on fds.
+
 2009-11-23  Werner Koch  <wk@g10code.com>
 
 	* gpg.c (gpgconf_list): Add key "default_pubkey_algo".
diff --git a/g10/server.c b/g10/server.c
index 8b5694128..ee8089491 100644
--- a/g10/server.c
+++ b/g10/server.c
@@ -658,8 +658,8 @@ gpg_server (ctrl_t ctrl)
   /* We use a pipe based server so that we can work from scripts.
      assuan_init_pipe_server will automagically detect when we are
      called with a socketpair and ignore FILEDES in this case.  */
-  filedes[0] = 0;
-  filedes[1] = 1;
+  filedes[0] = assuan_fdopen (0);
+  filedes[1] = assuan_fdopen (1);
   rc = assuan_new (&ctx);
   if (rc)
     {
diff --git a/g13/server.c b/g13/server.c
index f20d62026..76bfdf486 100644
--- a/g13/server.c
+++ b/g13/server.c
@@ -574,7 +574,7 @@ gpg_error_t
 g13_server (ctrl_t ctrl)
 {
   gpg_error_t err;
-  int filedes[2];
+  assuan_fd_t filedes[2];
   assuan_context_t ctx = NULL;
   static const char hello[] = ("GNU Privacy Guard's G13 server "
                                PACKAGE_VERSION " ready");
@@ -582,8 +582,8 @@ g13_server (ctrl_t ctrl)
   /* We use a pipe based server so that we can work from scripts.
      assuan_init_pipe_server will automagically detect when we are
      called with a socketpair and ignore FIELDES in this case. */
-  filedes[0] = 0;
-  filedes[1] = 1;
+  filedes[0] = assuan_fdopen (0);
+  filedes[1] = assuan_fdopen (1);
   err = assuan_new (&ctx);
   if (err)
     {
diff --git a/scd/ChangeLog b/scd/ChangeLog
index 906485018..965e07bbb 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-25  Marcus Brinkmann  <marcus@g10code.de>
+
+	* command.c (scd_command_handler): Use assuan_fd_t and
+	assuan_fdopen on fds.
+
 2009-11-05  Marcus Brinkmann  <marcus@g10code.de>
 
 	* command.c (scd_command_handler): Call assuan_init_socket_server,
diff --git a/scd/command.c b/scd/command.c
index 110ec7232..2e7c5b998 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -1913,10 +1913,10 @@ scd_command_handler (ctrl_t ctrl, int fd)
 
   if (fd == -1)
     {
-      int filedes[2];
+      assuan_fd_t filedes[2];
 
-      filedes[0] = 0;
-      filedes[1] = 1;
+      filedes[0] = assuan_fdopen (0);
+      filedes[1] = assuan_fdopen (1);
       rc = assuan_init_pipe_server (ctx, filedes);
     }
   else
diff --git a/sm/ChangeLog b/sm/ChangeLog
index f5d8da515..80235db78 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-25  Marcus Brinkmann  <marcus@g10code.de>
+
+	* server.c (gpgsm_server): Use assuan_fd_t and assuan_fdopen on
+	fds.
+
 2009-11-23  Werner Koch  <wk@g10code.com>
 
 	* gpgsm.c (main) <aGpgConfList>: Add key "default_pubkey_algo".
diff --git a/sm/server.c b/sm/server.c
index 05e366527..ad39e93f4 100644
--- a/sm/server.c
+++ b/sm/server.c
@@ -1205,7 +1205,7 @@ void
 gpgsm_server (certlist_t default_recplist)
 {
   int rc;
-  int filedes[2];
+  assuan_fd_t filedes[2];
   assuan_context_t ctx;
   struct server_control_s ctrl;
   static const char hello[] = ("GNU Privacy Guard's S/M server "
@@ -1217,8 +1217,8 @@ gpgsm_server (certlist_t default_recplist)
   /* We use a pipe based server so that we can work from scripts.
      assuan_init_pipe_server will automagically detect when we are
      called with a socketpair and ignore FIELDES in this case. */
-  filedes[0] = 0;
-  filedes[1] = 1;
+  filedes[0] = assuan_fdopen (0);
+  filedes[1] = assuan_fdopen (1);
   rc = assuan_new (&ctx);
   if (rc)
     {