* Makefile.am (pkglib_PROGRAMS): Put protect-tool there.

* findkey.c (agent_write_private_key,agent_key_from_file)
(agent_key_available): Use GNUPG_PRIVATE_KEYS_DIR constant.
* gpg-agent.c (main): Use GNUPG_DEFAULT_HOMEDIR constant.

* protect-tool.c (store_private_key): New.
(import_p12_file): Store the new file if requested.
(main): New options --force and --store.

* gpg-agent.c (main): Set a global flag when runing detached.
* query.c (start_pinentry): Pass the list of FD to keep in the
child when not running detached.
* call-scd.c (start_scd): Ditto.

1 files changed, 19 insertions, 3 deletions

diff --git a/agent/command.c b/agent/command.c
index 387eef417..b98ec25ff 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -110,7 +110,10 @@ cmd_istrusted (ASSUAN_CONTEXT ctx, char *line)
   else if (rc == -1)
     return ASSUAN_Not_Trusted;
   else
-    return map_to_assuan_status (rc);
+    {
+      log_error ("command is_trusted failed: %s\n", gnupg_strerror (rc));
+      return map_to_assuan_status (rc);
+    }
 }
 
 /* LISTTRUSTED 
@@ -119,7 +122,10 @@ cmd_istrusted (ASSUAN_CONTEXT ctx, char *line)
 static int
 cmd_listtrusted (ASSUAN_CONTEXT ctx, char *line)
 {
-  return map_to_assuan_status (agent_listtrusted (ctx));
+  int rc = agent_listtrusted (ctx);
+  if (rc)
+    log_error ("command listtrusted failed: %s\n", gnupg_strerror (rc));
+  return map_to_assuan_status (rc);
 }
 
 
@@ -158,6 +164,8 @@ cmd_marktrusted (ASSUAN_CONTEXT ctx, char *line)
     p++;
 
   rc = agent_marktrusted (p, fpr, flag);
+  if (rc)
+    log_error ("command marktrusted failed: %s\n", gnupg_strerror (rc));
   return map_to_assuan_status (rc);
 }
 
@@ -281,6 +289,8 @@ cmd_pksign (ASSUAN_CONTEXT ctx, char *line)
   CTRL ctrl = assuan_get_pointer (ctx);
 
   rc = agent_pksign (ctrl, assuan_get_data_fp (ctx));
+  if (rc)
+    log_error ("command pksign failed: %s\n", gnupg_strerror (rc));
   return map_to_assuan_status (rc);
 }
 
@@ -304,6 +314,8 @@ cmd_pkdecrypt (ASSUAN_CONTEXT ctx, char *line)
 
   rc = agent_pkdecrypt (ctrl, value, valuelen, assuan_get_data_fp (ctx));
   xfree (value);
+  if (rc)
+    log_error ("command pkdecrypt failed: %s\n", gnupg_strerror (rc));
   return map_to_assuan_status (rc);
 }
 
@@ -337,6 +349,8 @@ cmd_genkey (ASSUAN_CONTEXT ctx, char *line)
 
   rc = agent_genkey (ctrl, value, valuelen, assuan_get_data_fp (ctx));
   xfree (value);
+  if (rc)
+    log_error ("command genkey failed: %s\n", gnupg_strerror (rc));
   return map_to_assuan_status (rc);
 }
 
@@ -449,6 +463,8 @@ cmd_get_passphrase (ASSUAN_CONTEXT ctx, char *line)
         }
     }
 
+  if (rc)
+    log_error ("command get_passphrase failed: %s\n", gnupg_strerror (rc));
   return map_to_assuan_status (rc);
 }
 
@@ -491,7 +507,7 @@ cmd_learn (ASSUAN_CONTEXT ctx, char *line)
 
   rc = agent_handle_learn (has_option (line, "--send")? ctx : NULL);
   if (rc)
-    log_error ("agent_handle_learn failed: %s\n", gnupg_strerror (rc));
+    log_error ("command learn failed: %s\n", gnupg_strerror (rc));
   return map_to_assuan_status (rc);
 }