← Back to branch summary

~ubuntu-branches/ubuntu/raring/gnupg2/raring-updates

« back to all changes in this revision

Viewing changes to g10/trustdb.c

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher
  • Date: 2012-11-06 11:25:58 UTC
  • mfrom: (1.1.16) (7.1.8 raring-proposed)
  • Revision ID: package-import@ubuntu.com-20121106112558-lkpndvv4gqthgrn4
Tags: 2.0.19-1ubuntu1
* Resynchronize on Debian, remaining changes:
  - Add udev rules to give gpg access to some smartcard readers;
    Debian #543217.
    . debian/gnupg2.dev: udev rules to set ACLs on SCM smartcard readers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
g10/trustdb.c
1
1
/* trustdb.c
2
2
 * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
3
 
 *               2008 Free Software Foundation, Inc.
 
3
 *               2008, 2012 Free Software Foundation, Inc.
4
4
 *
5
5
 * This file is part of GnuPG.
6
6
 *
656
656
 
657
657
void
658
658
read_trust_options(byte *trust_model,ulong *created,ulong *nextcheck,
659
 
                   byte *marginals,byte *completes,byte *cert_depth)
 
659
                   byte *marginals,byte *completes,byte *cert_depth,
 
660
                   byte *min_cert_level)
660
661
{
661
662
  TRUSTREC opts;
662
663
 
676
677
    *completes=opts.r.ver.completes;
677
678
  if(cert_depth)
678
679
    *cert_depth=opts.r.ver.cert_depth;
 
680
  if(min_cert_level)
 
681
    *min_cert_level=opts.r.ver.min_cert_level;
679
682
}
680
683
 
681
684
/***********************************************
1041
1044
 
1042
1045
      did_nextcheck = 1;
1043
1046
      scheduled = tdbio_read_nextcheck ();
1044
 
      if (scheduled && scheduled <= make_timestamp ())
 
1047
      if ((scheduled && scheduled <= make_timestamp ())
 
1048
          || pending_check_trustdb)
1045
1049
        {
1046
1050
          if (opt.no_auto_check_trustdb) 
1047
1051
            {