[svn] GnuPG - r5200 - in trunk: agent g10 g13 scd sm
svn author marcus
cvs at cvs.gnupg.org
Wed Nov 25 18:58:27 CET 2009
Author: marcus
Date: 2009-11-25 18:58:26 +0100 (Wed, 25 Nov 2009)
New Revision: 5200
Modified:
trunk/agent/ChangeLog
trunk/agent/command.c
trunk/g10/ChangeLog
trunk/g10/server.c
trunk/g13/server.c
trunk/scd/ChangeLog
trunk/scd/command.c
trunk/sm/ChangeLog
trunk/sm/server.c
Log:
agent/
2009-11-25 Marcus Brinkmann <marcus at g10code.de>
* command.c (start_command_handler): Use assuan_fd_t and
assuan_fdopen on fds.
scd/
2009-11-25 Marcus Brinkmann <marcus at g10code.de>
* command.c (scd_command_handler): Use assuan_fd_t and
assuan_fdopen on fds.
sm/
2009-11-25 Marcus Brinkmann <marcus at g10code.de>
* server.c (gpgsm_server): Use assuan_fd_t and assuan_fdopen on
fds.
g10/
2009-11-25 Marcus Brinkmann <marcus at g10code.de>
* server.c (gpg_server): Use assuan_fd_t and assuan_fdopen on fds.
Modified: trunk/agent/ChangeLog
===================================================================
--- trunk/agent/ChangeLog 2009-11-23 19:18:04 UTC (rev 5199)
+++ trunk/agent/ChangeLog 2009-11-25 17:58:26 UTC (rev 5200)
@@ -1,3 +1,8 @@
+2009-11-25 Marcus Brinkmann <marcus at g10code.de>
+
+ * command.c (start_command_handler): Use assuan_fd_t and
+ assuan_fdopen on fds.
+
2009-11-05 Marcus Brinkmann <marcus at g10code.de>
* call-pinentry.c (start_pinentry): Call assuan_pipe_connect, not
Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog 2009-11-23 19:18:04 UTC (rev 5199)
+++ trunk/g10/ChangeLog 2009-11-25 17:58:26 UTC (rev 5200)
@@ -1,3 +1,7 @@
+2009-11-25 Marcus Brinkmann <marcus at g10code.de>
+
+ * server.c (gpg_server): Use assuan_fd_t and assuan_fdopen on fds.
+
2009-11-23 Werner Koch <wk at g10code.com>
* gpg.c (gpgconf_list): Add key "default_pubkey_algo".
Modified: trunk/scd/ChangeLog
===================================================================
--- trunk/scd/ChangeLog 2009-11-23 19:18:04 UTC (rev 5199)
+++ trunk/scd/ChangeLog 2009-11-25 17:58:26 UTC (rev 5200)
@@ -1,3 +1,8 @@
+2009-11-25 Marcus Brinkmann <marcus at g10code.de>
+
+ * command.c (scd_command_handler): Use assuan_fd_t and
+ assuan_fdopen on fds.
+
2009-11-05 Marcus Brinkmann <marcus at g10code.de>
* command.c (scd_command_handler): Call assuan_init_socket_server,
Modified: trunk/sm/ChangeLog
===================================================================
--- trunk/sm/ChangeLog 2009-11-23 19:18:04 UTC (rev 5199)
+++ trunk/sm/ChangeLog 2009-11-25 17:58:26 UTC (rev 5200)
@@ -1,3 +1,8 @@
+2009-11-25 Marcus Brinkmann <marcus at g10code.de>
+
+ * server.c (gpgsm_server): Use assuan_fd_t and assuan_fdopen on
+ fds.
+
2009-11-23 Werner Koch <wk at g10code.com>
* gpgsm.c (main) <aGpgConfList>: Add key "default_pubkey_algo".
Modified: trunk/agent/command.c
===================================================================
--- trunk/agent/command.c 2009-11-23 19:18:04 UTC (rev 5199)
+++ trunk/agent/command.c 2009-11-25 17:58:26 UTC (rev 5200)
@@ -1916,10 +1916,10 @@
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)
Modified: trunk/g10/server.c
===================================================================
--- trunk/g10/server.c 2009-11-23 19:18:04 UTC (rev 5199)
+++ trunk/g10/server.c 2009-11-25 17:58:26 UTC (rev 5200)
@@ -658,8 +658,8 @@
/* 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)
{
Modified: trunk/g13/server.c
===================================================================
--- trunk/g13/server.c 2009-11-23 19:18:04 UTC (rev 5199)
+++ trunk/g13/server.c 2009-11-25 17:58:26 UTC (rev 5200)
@@ -574,7 +574,7 @@
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 @@
/* 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)
{
Modified: trunk/scd/command.c
===================================================================
--- trunk/scd/command.c 2009-11-23 19:18:04 UTC (rev 5199)
+++ trunk/scd/command.c 2009-11-25 17:58:26 UTC (rev 5200)
@@ -1913,10 +1913,10 @@
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
Modified: trunk/sm/server.c
===================================================================
--- trunk/sm/server.c 2009-11-23 19:18:04 UTC (rev 5199)
+++ trunk/sm/server.c 2009-11-25 17:58:26 UTC (rev 5200)
@@ -1205,7 +1205,7 @@
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 @@
/* 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)
{
More information about the Gnupg-commits
mailing list