aboutsummaryrefslogtreecommitdiffstats
path: root/agent/call-scd.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2005-05-20 20:39:36 +0000
committerWerner Koch <[email protected]>2005-05-20 20:39:36 +0000
commit41862f5f13bef8113cf040ecaba34a35c370eeb3 (patch)
tree8deaa1ca3c63351b2ef028947aa445b422081e9f /agent/call-scd.c
parentChanged the scdaemon to handle concurrent sessions. Adjusted (diff)
downloadgnupg-41862f5f13bef8113cf040ecaba34a35c370eeb3.tar.gz
gnupg-41862f5f13bef8113cf040ecaba34a35c370eeb3.zip
* protect-tool.c: New option --canonical.
(show_file): Implement it. * keyformat.txt: Define the created-at attribute for keys. * ccid-driver.c: Replaced macro DEBUG_T1 by a new debug level. (parse_ccid_descriptor): Mark SCR335 firmware version 5.18 good. (ccid_transceive): Arghhh. The seqno is another bit in the R-block than in the I block, this was wrong at one place. * scdaemon.c: New options --debug-ccid-driver and --debug-disable-ticker. * app-openpgp.c (do_genkey, do_writekey): Factored code to check for existing key out into .. (does_key_exist): .. New function. * gpg-connect-agent.c (add_definq, show_definq, clear_definq) (handle_inquire): New. (read_and_print_response): Handle INQUIRE command. (main): Implement control commands.
Diffstat (limited to '')
-rw-r--r--agent/call-scd.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/agent/call-scd.c b/agent/call-scd.c
index 58dd412f0..fc81e2fa3 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -158,7 +158,7 @@ start_scd (ctrl_t ctrl)
gpg_error_t err = 0;
const char *pgmname;
assuan_context_t ctx;
- const char *argv[4];
+ const char *argv[3];
int no_close_list[3];
int i;
int rc;
@@ -266,9 +266,8 @@ start_scd (ctrl_t ctrl)
pgmname++;
argv[0] = pgmname;
- argv[1] = "--server";
- argv[2] = "--multi-server";
- argv[3] = NULL;
+ argv[1] = "--multi-server";
+ argv[2] = NULL;
i=0;
if (!opt.running_detached)