diff options
author | David Shaw <[email protected]> | 2005-03-17 22:55:17 +0000 |
---|---|---|
committer | David Shaw <[email protected]> | 2005-03-17 22:55:17 +0000 |
commit | ff93f3528ae2d80935e26496bdf0afc86613cc31 (patch) | |
tree | 3f5410100df42b9ca623871771c76c2fcf36f3c1 /g10/options.h | |
parent | * gpgkeys_curl.c, gpgkeys_finger.c, gpgkeys_ldap.c: Start using (diff) | |
download | gnupg-ff93f3528ae2d80935e26496bdf0afc86613cc31.tar.gz gnupg-ff93f3528ae2d80935e26496bdf0afc86613cc31.zip |
* options.h, keyserver.c (parse_keyserver_options, keyserver_spawn): Don't
treat 'verbose' and 'include-disabled' as special. Just pass them through
silently to the keyserver helper.
Diffstat (limited to 'g10/options.h')
-rw-r--r-- | g10/options.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/g10/options.h b/g10/options.h index 2f7b03e15..e3713fc8b 100644 --- a/g10/options.h +++ b/g10/options.h @@ -1,6 +1,6 @@ /* options.h - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, - * 2004 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, + * 2005 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -137,7 +137,6 @@ struct } *keyserver; struct { - int verbose; unsigned int options; unsigned int import_options; unsigned int export_options; @@ -283,13 +282,12 @@ struct { #define VERIFY_SHOW_UNUSABLE_UIDS (1<<6) #define KEYSERVER_INCLUDE_REVOKED (1<<0) -#define KEYSERVER_INCLUDE_DISABLED (1<<1) -#define KEYSERVER_INCLUDE_SUBKEYS (1<<2) -#define KEYSERVER_USE_TEMP_FILES (1<<3) -#define KEYSERVER_KEEP_TEMP_FILES (1<<4) -#define KEYSERVER_ADD_FAKE_V3 (1<<5) -#define KEYSERVER_AUTO_KEY_RETRIEVE (1<<6) -#define KEYSERVER_TRY_DNS_SRV (1<<7) -#define KEYSERVER_HONOR_KEYSERVER_URL (1<<8) +#define KEYSERVER_INCLUDE_SUBKEYS (1<<1) +#define KEYSERVER_USE_TEMP_FILES (1<<2) +#define KEYSERVER_KEEP_TEMP_FILES (1<<3) +#define KEYSERVER_ADD_FAKE_V3 (1<<4) +#define KEYSERVER_AUTO_KEY_RETRIEVE (1<<5) +#define KEYSERVER_TRY_DNS_SRV (1<<6) +#define KEYSERVER_HONOR_KEYSERVER_URL (1<<7) #endif /*G10_OPTIONS_H*/ |