Index: gnupg-2.1.14a/sm/call-agent.c
===================================================================
--- gnupg-2.1.14a/sm/call-agent.c
+++ gnupg-2.1.14a/sm/call-agent.c
@@ -234,6 +234,7 @@
   rc = start_agent (ctrl);
   if (rc)
     return rc;
+  inq_parm.ctx = agent_ctx;
 
   if (digestlen*2 + 50 > DIM(line))
     return gpg_error (GPG_ERR_GENERAL);
@@ -320,6 +321,7 @@
   rc = start_agent (ctrl);
   if (rc)
     return rc;
+  inq_parm.ctx = agent_ctx;
 
   if (digestlen*2 + 50 > DIM(line))
     return gpg_error (GPG_ERR_GENERAL);
@@ -586,6 +588,7 @@
   rc = start_agent (ctrl);
   if (rc)
     return rc;
+  inq_parm.ctx = agent_ctx;
 
   rc = assuan_transact (agent_ctx, "RESET",NULL, NULL, NULL, NULL, NULL, NULL);
   if (rc)
@@ -674,6 +677,7 @@
   rc = start_agent (ctrl);
   if (rc)
     return rc;
+  inq_parm.ctx = agent_ctx;
 
   rc = assuan_transact (agent_ctx, "SCD SERIALNO",
                         NULL, NULL,
@@ -744,6 +748,7 @@
   rc = start_agent (ctrl);
   if (rc)
     return rc;
+  inq_parm.ctx = agent_ctx;
 
   rc = assuan_transact (agent_ctx, "SCD LEARN --force",
                         NULL, NULL,
@@ -841,6 +846,7 @@
   rc = start_agent (ctrl);
   if (rc)
     return rc;
+  inq_parm.ctx = agent_ctx;
 
   fpr = gpgsm_get_fingerprint_hexstring (cert, GCRY_MD_SHA1);
   if (!fpr)
@@ -1028,6 +1034,7 @@
   rc = start_agent (ctrl);
   if (rc)
     return rc;
+  inq_parm.ctx = agent_ctx;
 
   if (!hexkeygrip || strlen (hexkeygrip) != 40)
     return gpg_error (GPG_ERR_INV_VALUE);
@@ -1064,6 +1071,7 @@
   rc = start_agent (ctrl);
   if (rc)
     return rc;
+  inq_parm.ctx = agent_ctx;
 
   snprintf (line, DIM(line)-1, "GET_CONFIRMATION %s", desc);
   line[DIM(line)-1] = 0;
@@ -1177,6 +1185,7 @@
   err = start_agent (ctrl);
   if (err)
     return err;
+  inq_parm.ctx = agent_ctx;
 
   if (desc_msg && *desc_msg && !(arg4 = percent_plus_escape (desc_msg)))
     return gpg_error_from_syserror ();
@@ -1223,6 +1232,7 @@
   err = start_agent (ctrl);
   if (err)
     return err;
+  inq_parm.ctx = agent_ctx;
 
   snprintf (line, DIM(line)-1, "KEYWRAP_KEY %s",
             forexport? "--export":"--import");
@@ -1313,6 +1323,7 @@
   err = start_agent (ctrl);
   if (err)
     return err;
+  inq_parm.ctx = agent_ctx;
 
   if (desc)
     {