diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/keyserver.c | 10 | ||||
| -rw-r--r-- | g10/options.h | 1 |
3 files changed, 9 insertions, 7 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 35f20b06e..4660e9df2 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,10 @@ 2006-02-22 David Shaw <[email protected]> + * options.h, keyserver.c (parse_keyserver_options): Remove + auto-cert-retrieve as it is no longer meaningful. Add + max-cert-size to allow users to pick a max key size retrieved via + CERT. + * options.h, gpg.c (main), mainproc.c (check_sig_and_print), keyserver.c (keyserver_opts): Rename auto-pka-retrieve to honor-pka-record to be consistent with honor-keyserver-url. diff --git a/g10/keyserver.c b/g10/keyserver.c index 615794918..d9ed7ebbc 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -72,6 +72,7 @@ enum ks_action {KS_UNKNOWN=0,KS_GET,KS_GETNAME,KS_SEND,KS_SEARCH}; static struct parse_options keyserver_opts[]= { + {"max-cert-size",0,NULL,NULL}, {"include-revoked",KEYSERVER_INCLUDE_REVOKED,NULL, N_("include revoked keys in search results")}, {"include-subkeys",KEYSERVER_INCLUDE_SUBKEYS,NULL, @@ -85,8 +86,6 @@ static struct parse_options keyserver_opts[]= NULL}, {"auto-key-retrieve",KEYSERVER_AUTO_KEY_RETRIEVE,NULL, N_("automatically retrieve keys when verifying signatures")}, - {"auto-cert-retrieve",KEYSERVER_AUTO_CERT_RETRIEVE,NULL, - N_("automatically retrieve keys from DNS")}, {"try-dns-srv",KEYSERVER_TRY_DNS_SRV,NULL, NULL}, {"honor-keyserver-url",KEYSERVER_HONOR_KEYSERVER_URL,NULL, @@ -112,7 +111,7 @@ parse_keyserver_options(char *options) char *tok; char *max_cert; - keyserver_opts[7].value=&max_cert; + keyserver_opts[0].value=&max_cert; while((tok=optsep(&options))) { @@ -173,10 +172,9 @@ parse_keyserver_options(char *options) } } - if(opt.keyserver_options.options&KEYSERVER_AUTO_CERT_RETRIEVE) + if(max_cert) { - if(max_cert) - max_cert_size=strtoul(max_cert,(char **)NULL,10); + max_cert_size=strtoul(max_cert,(char **)NULL,10); if(max_cert_size==0) max_cert_size=DEFAULT_MAX_CERT_SIZE; diff --git a/g10/options.h b/g10/options.h index 433016a96..d60924187 100644 --- a/g10/options.h +++ b/g10/options.h @@ -320,6 +320,5 @@ struct { #define KEYSERVER_TRY_DNS_SRV (1<<6) #define KEYSERVER_HONOR_KEYSERVER_URL (1<<7) #define KEYSERVER_HONOR_PKA_RECORD (1<<8) -#define KEYSERVER_AUTO_CERT_RETRIEVE (1<<9) #endif /*G10_OPTIONS_H*/ |