diff options
| author | Werner Koch <[email protected]> | 2009-03-26 11:33:53 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2009-03-26 11:33:53 +0000 |
| commit | 6e63e54b0047bbf9379eedca0b388a56a0ec7b12 (patch) | |
| tree | 08e308c760e6e82444839fc8f88148b4dbd6a96a /sm | |
| parent | Print NO_SECKEY status line in gpgsm. (diff) | |
| download | gnupg-6e63e54b0047bbf9379eedca0b388a56a0ec7b12.tar.gz gnupg-6e63e54b0047bbf9379eedca0b388a56a0ec7b12.zip | |
Fixed a trustlist update problem.
Pretty format the marktrusted pinentry prompt.
Diffstat (limited to 'sm')
| -rw-r--r-- | sm/ChangeLog | 8 | ||||
| -rw-r--r-- | sm/call-agent.c | 10 |
2 files changed, 13 insertions, 5 deletions
diff --git a/sm/ChangeLog b/sm/ChangeLog index 6b435dac8..0905159ce 100644 --- a/sm/ChangeLog +++ b/sm/ChangeLog @@ -1,7 +1,11 @@ +2009-03-26 Werner Koch <[email protected]> + + * call-agent.c (gpgsm_agent_marktrusted): Format the issuer name. + 2009-03-25 Werner Koch <[email protected]> - * decrypt.c (gpgsm_decrypt): Print ENC_TO and NO_SECKEY - stati. Fixes bug#1020. + * decrypt.c (gpgsm_decrypt): Print ENC_TO and NO_SECKEY stati. + Fixes bug#1020. * fingerprint.c (gpgsm_get_short_fingerprint): Add arg R_HIGH and change all callers. diff --git a/sm/call-agent.c b/sm/call-agent.c index 3616ea936..1f8eecb3b 100644 --- a/sm/call-agent.c +++ b/sm/call-agent.c @@ -612,7 +612,7 @@ int gpgsm_agent_marktrusted (ctrl_t ctrl, ksba_cert_t cert) { int rc; - char *fpr, *dn; + char *fpr, *dn, *dnfmt; char line[ASSUAN_LINELENGTH]; rc = start_agent (ctrl); @@ -632,9 +632,13 @@ gpgsm_agent_marktrusted (ctrl_t ctrl, ksba_cert_t cert) xfree (fpr); return gpg_error (GPG_ERR_GENERAL); } - snprintf (line, DIM(line)-1, "MARKTRUSTED %s S %s", fpr, dn); + dnfmt = gpgsm_format_name2 (dn, 0); + xfree (dn); + if (!dnfmt) + return gpg_error_from_syserror (); + snprintf (line, DIM(line)-1, "MARKTRUSTED %s S %s", fpr, dnfmt); line[DIM(line)-1] = 0; - ksba_free (dn); + ksba_free (dnfmt); xfree (fpr); rc = assuan_transact (agent_ctx, line, NULL, NULL, |