aboutsummaryrefslogtreecommitdiffstats
path: root/sm
diff options
context:
space:
mode:
Diffstat (limited to 'sm')
-rw-r--r--sm/ChangeLog5
-rw-r--r--sm/server.c6
2 files changed, 8 insertions, 3 deletions
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 <[email protected]>
+
+ * server.c (gpgsm_server): Use assuan_fd_t and assuan_fdopen on
+ fds.
+
2009-11-23 Werner Koch <[email protected]>
* 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)
{