From 6477e51919ef97f0f9cc05d10cdc7aa2b89faafe Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 6 May 2014 09:49:26 +0200
Subject: [PATCH] Use "samethread" mode keyword for some es_fopenmem.

* dirmngr/ks-engine-hkp.c (armor_data): Add mode keyword.
* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
* scd/atr.c (atr_dump): Ditto.
---
 dirmngr/ks-engine-hkp.c | 2 +-
 g10/call-dirmngr.c      | 2 +-
 scd/atr.c               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
index c115cf562..8c3384d49 100644
--- a/dirmngr/ks-engine-hkp.c
+++ b/dirmngr/ks-engine-hkp.c
@@ -925,7 +925,7 @@ armor_data (char **r_string, const void *data, size_t datalen)
 
   *r_string = NULL;
 
-  fp = es_fopenmem (0, "rw");
+  fp = es_fopenmem (0, "rw,samethread");
   if (!fp)
     return gpg_error_from_syserror ();
 
diff --git a/g10/call-dirmngr.c b/g10/call-dirmngr.c
index 73f829ef2..5bddbbeda 100644
--- a/g10/call-dirmngr.c
+++ b/g10/call-dirmngr.c
@@ -593,7 +593,7 @@ ks_put_inq_cb (void *opaque, const char *line)
       estream_t fp;
 
       /* Parse the keyblock and send info lines back to the server.  */
-      fp = es_fopenmem (0, "rw");
+      fp = es_fopenmem (0, "rw,samethread");
       if (!fp)
         err = gpg_error_from_syserror ();
 
diff --git a/scd/atr.c b/scd/atr.c
index b8668a41d..c3fa49f4b 100644
--- a/scd/atr.c
+++ b/scd/atr.c
@@ -50,7 +50,7 @@ atr_dump (const void *buffer, size_t buflen)
   unsigned char chksum;
   char *result;
 
-  fp = es_fopenmem (0, "rwb");
+  fp = es_fopenmem (0, "rwb,samethread");
   if (!fp)
     return NULL;