~ubuntu-branches/ubuntu/karmic/gnupg2/karmic-security

« back to all changes in this revision

Viewing changes to g10/options.h

  • Committer: Bazaar Package Importer
  • Author(s): Eric Dorland
  • Date: 2009-03-08 22:46:47 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20090308224647-gq17gatcl71lrc2k
Tags: 2.0.11-1
* New upstream release. (Closes: #496663)
* debian/control: Make the description a little more distinctive than
  gnupg v1's. Thanks Jari Aalto. (Closes: #496323)

Show diffs side-by-side

added added

removed removed

Lines of Context:
179
179
  int no_literal;
180
180
  ulong set_filesize;
181
181
  int fast_list_mode;
182
 
  int fixed_list_mode;
183
182
  int ignore_time_conflict;
184
183
  int ignore_valid_from;
185
184
  int ignore_crc_error;
235
234
     keyring. */
236
235
  struct akl
237
236
  {
238
 
    enum {AKL_CERT, AKL_PKA, AKL_LDAP, AKL_KEYSERVER, AKL_SPEC} type;
 
237
    enum {
 
238
      AKL_NODEFAULT,
 
239
      AKL_LOCAL,
 
240
      AKL_CERT, 
 
241
      AKL_PKA, 
 
242
      AKL_LDAP,
 
243
      AKL_KEYSERVER,
 
244
      AKL_SPEC
 
245
    } type;
239
246
    struct keyserver_spec *spec;
240
247
    struct akl *next;
241
248
  } *auto_key_locate;