← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gnupg2/oneiric-updates

« back to all changes in this revision

Viewing changes to sm/certchain.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Bienia
  • Date: 2009-11-07 13:12:03 UTC
  • mfrom: (1.1.13 upstream) (7.1.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091107131203-vgyndyfgtwch7v61
Tags: 2.0.13-1ubuntu1
https://launchpad.net/bugs/477491
* Merge with Debian testing (lp: #477491). Remaining changes:
  - Build-depend on libreadline-dev instead of libreadline5-dev.
  - debian/gnupg2.dev: udev rules to set ACLs on SCM smartcard readers.
  - debian/rules: Call dh_installudev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sm/certchain.c
889
889
  gpg_error_t err;
890
890
 
891
891
  if (opt.no_crl_check && !ctrl->use_ocsp)
892
 
    return 0;
 
892
    {
 
893
      audit_log_ok (ctrl->audit, AUDIT_CRL_CHECK, 
 
894
                    gpg_error (GPG_ERR_NOT_ENABLED));
 
895
      return 0;
 
896
    }
893
897
 
894
898
  err = gpgsm_dirmngr_isvalid (ctrl,
895
899
                               subject_cert, issuer_cert, 
896
900
                               force_ocsp? 2 : !!ctrl->use_ocsp);
 
901
  audit_log_ok (ctrl->audit, AUDIT_CRL_CHECK, err);
 
902
 
897
903
  if (err)
898
904
    {
899
905
      if (!lm)