diff options
| -rw-r--r-- | sm/ChangeLog | 4 | ||||
| -rw-r--r-- | sm/import.c | 16 |
2 files changed, 19 insertions, 1 deletions
diff --git a/sm/ChangeLog b/sm/ChangeLog index ea4aac590..9f41ef864 100644 --- a/sm/ChangeLog +++ b/sm/ChangeLog @@ -1,3 +1,7 @@ +2002-05-23 Werner Koch <[email protected]> + + * import.c (gpgsm_import): Add error messages. + 2002-05-21 Werner Koch <[email protected]> * keylist.c (list_internal_keys): Renamed from gpgsm_list_keys. diff --git a/sm/import.c b/sm/import.c index 1463407a1..0f4547206 100644 --- a/sm/import.c +++ b/sm/import.c @@ -109,11 +109,16 @@ gpgsm_import (CTRL ctrl, int in_fd) if (opt.verbose) log_info ("certificate imported\n"); } + else + log_error (_("error storing certificate\n")); } + else + log_error (_("basic certificate checks failed - not imported\n")); ksba_cert_release (cert); cert = NULL; } - + if (!i) + log_error ("no certificate found\n"); } else if (ct == KSBA_CT_NONE) { /* Failed to identify this message - assume a certificate */ @@ -139,7 +144,11 @@ gpgsm_import (CTRL ctrl, int in_fd) if (opt.verbose) log_info ("certificate imported\n"); } + else + log_error (_("error storing certificate\n")); } + else + log_error (_("basic certificate checks failed - not imported\n")); } else { @@ -154,6 +163,11 @@ gpgsm_import (CTRL ctrl, int in_fd) gpgsm_destroy_reader (b64reader); if (fp) fclose (fp); + /* If we never printed an error message do it now so that a command + line invocation will return with an error (log_error keeps a + global errorcount) */ + if (rc && !log_get_errorcount (0)) + log_error (_("error importing certificate: %s\n"), gnupg_strerror (rc)); return rc; } |