diff options
Diffstat (limited to 'g10')
-rw-r--r-- | g10/ChangeLog | 6 | ||||
-rw-r--r-- | g10/call-agent.c | 2 | ||||
-rw-r--r-- | g10/gpg.c | 6 |
3 files changed, 13 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 765ac770d..10ebcca20 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2006-09-01 Werner Koch <[email protected]> + + * call-agent.c: Do not force using the pipe server. + + * gpg.c (main): Enable card related commands. + 2006-08-22 Werner Koch <[email protected]> * mainproc.c (proc_plaintext): Fixed a #warning diff --git a/g10/call-agent.c b/g10/call-agent.c index 524b274c1..413a7c830 100644 --- a/g10/call-agent.c +++ b/g10/call-agent.c @@ -48,7 +48,7 @@ #endif static assuan_context_t agent_ctx = NULL; -static int force_pipe_server = 1; /* FIXME: set this back to 0. */ +static int force_pipe_server; struct cipher_parm_s { @@ -2012,8 +2012,14 @@ main (int argc, char **argv ) case aRefreshKeys: case aFetchKeys: case aExport: +#ifdef ENABLE_CARD_SUPPORT + case aCardStatus: + case aCardEdit: + case aChangePIN: +#endif /* ENABLE_CARD_SUPPORT*/ set_cmd (&cmd, pargs.r_opt); break; + case aListKeys: set_cmd( &cmd, aListKeys); break; case aListSigs: set_cmd( &cmd, aListSigs); break; case aExportSecret: set_cmd( &cmd, aExportSecret); break; |