← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnupg/trusty-updates

« back to all changes in this revision

Viewing changes to g10/keylist.c

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2012-12-04 22:26:16 UTC
  • mfrom: (1.1.18 sid)
  • Revision ID: package-import@ubuntu.com-20121204222616-cr0fow26geq90l3y
Tags: 1.4.12-6ubuntu1
* Resynchronise with Debian.  Remaining changes:
  - Disable mlock() test since it fails with ulimit 0 (on buildds).
  - Set gpg (or gpg2) and gpgsm to use a passphrase agent by default.
  - Only suggest gnupg-curl and libldap; recommendations are pulled into
    minimal, and we don't need the keyserver utilities in a minimal Ubuntu
    system.
  - Remove the Win32 build.
  - Update config.guess/config.sub for aarch64.
* Dropped patches:
  - Fix udeb build failure on powerpc, building with -O2 instead of -Os.
    (No longer seems to be necessary.)
* Simplify removal of Win32 build, to make this easier to merge in future.

Show diffs side-by-side

added added

removed removed

Lines of Context:
g10/keylist.c
1
1
/* keylist.c
2
2
 * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
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
 *
60
60
{
61
61
  if(opt.with_colons)
62
62
    {
63
 
      byte trust_model,marginals,completes,cert_depth;
 
63
      byte trust_model,marginals,completes,cert_depth,min_cert_level;
64
64
      ulong created,nextcheck;
65
65
 
66
66
      read_trust_options(&trust_model,&created,&nextcheck,
67
 
                         &marginals,&completes,&cert_depth);
 
67
                         &marginals,&completes,&cert_depth,&min_cert_level);
68
68
 
69
69
      printf("tru:");
70
70
 
80
80
            printf("c");
81
81
          if(cert_depth!=opt.max_cert_depth)
82
82
            printf("d");
 
83
          if(min_cert_level!=opt.min_cert_level)
 
84
            printf("l");
83
85
        }
84
86
 
85
87
      printf(":%d:%lu:%lu",trust_model,created,nextcheck);