diff options
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/gpg.c | 2 | ||||
| -rw-r--r-- | g10/keyserver.c | 23 | ||||
| -rw-r--r-- | g10/options.h | 15 |
4 files changed, 19 insertions, 26 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index ca69c50eb..700672117 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,10 @@ 2006-02-23 David Shaw <[email protected]> + * options.c, gpg.c (main), keyserver.c (keyserver_spawn): No + special treatment of include-revoked, include-subkeys, and + try-dns-srv. These are keyserver features, and GPG shouldn't get + involved here. + * keyserver.c (parse_keyserver_uri, add_canonical_option): Always append options to the list, as ordering may be significant to the user. @@ -1731,7 +1731,7 @@ main (int argc, char **argv ) opt.keyserver_options.import_options=IMPORT_REPAIR_PKS_SUBKEY_BUG; opt.keyserver_options.export_options=EXPORT_ATTRIBUTES; opt.keyserver_options.options= - KEYSERVER_INCLUDE_SUBKEYS|KEYSERVER_INCLUDE_REVOKED|KEYSERVER_TRY_DNS_SRV|KEYSERVER_HONOR_KEYSERVER_URL|KEYSERVER_HONOR_PKA_RECORD; + KEYSERVER_HONOR_KEYSERVER_URL|KEYSERVER_HONOR_PKA_RECORD; opt.verify_options= VERIFY_SHOW_POLICY_URLS|VERIFY_SHOW_STD_NOTATIONS|VERIFY_SHOW_KEYSERVER_URLS; opt.trust_model=TM_AUTO; diff --git a/g10/keyserver.c b/g10/keyserver.c index bc49d1b2d..050e00607 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -67,17 +67,13 @@ struct keyrec enum ks_action {KS_UNKNOWN=0,KS_GET,KS_GETNAME,KS_SEND,KS_SEARCH}; -/* Tell remote processes about these options */ -#define REMOTE_TELL (KEYSERVER_INCLUDE_REVOKED|KEYSERVER_INCLUDE_SUBKEYS|KEYSERVER_TRY_DNS_SRV) - static struct parse_options keyserver_opts[]= { + /* some of these options are not real - just for the help + message */ {"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, - N_("include subkeys when searching by key ID")}, - /* not a real option - just for the help message */ + {"include-revoked",0,NULL,N_("include revoked keys in search results")}, + {"include-subkeys",0,NULL,N_("include subkeys when searching by key ID")}, {"use-temp-files",0,NULL, N_("use temporary files to pass data to keyserver helpers")}, {"keep-temp-files",KEYSERVER_KEEP_TEMP_FILES,NULL, @@ -86,8 +82,6 @@ static struct parse_options keyserver_opts[]= NULL}, {"auto-key-retrieve",KEYSERVER_AUTO_KEY_RETRIEVE,NULL, N_("automatically retrieve keys when verifying signatures")}, - {"try-dns-srv",KEYSERVER_TRY_DNS_SRV,NULL, - NULL}, {"honor-keyserver-url",KEYSERVER_HONOR_KEYSERVER_URL,NULL, N_("honor the preferred keyserver URL set on the key")}, {"honor-pka-record",KEYSERVER_HONOR_PKA_RECORD,NULL, @@ -933,7 +927,6 @@ keyserver_spawn(enum ks_action action,STRLIST list,KEYDB_SEARCH_DESC *desc, unsigned int maxlen,buflen; char *command,*end,*searchstr=NULL; byte *line=NULL; - struct parse_options *kopts; struct exec_info *spawn; const char *scheme; const char *libexecdir = get_libexecdir (); @@ -1050,15 +1043,13 @@ keyserver_spawn(enum ks_action action,STRLIST list,KEYDB_SEARCH_DESC *desc, fprintf(spawn->tochild,"PATH %s\n",keyserver->path); } - /* Write options */ - - for(i=0,kopts=keyserver_opts;kopts[i].name;i++) - if(opt.keyserver_options.options & kopts[i].bit & REMOTE_TELL) - fprintf(spawn->tochild,"OPTION %s\n",kopts[i].name); + /* Write global options */ for(temp=opt.keyserver_options.other;temp;temp=temp->next) fprintf(spawn->tochild,"OPTION %s\n",temp->d); + /* Write per-keyserver options */ + for(temp=opt.keyserver->options;temp;temp=temp->next) fprintf(spawn->tochild,"OPTION %s\n",temp->d); diff --git a/g10/options.h b/g10/options.h index f5ccbbdc0..36de6331b 100644 --- a/g10/options.h +++ b/g10/options.h @@ -313,14 +313,11 @@ struct { #define VERIFY_SHOW_UID_VALIDITY (1<<5) #define VERIFY_SHOW_UNUSABLE_UIDS (1<<6) -#define KEYSERVER_INCLUDE_REVOKED (1<<0) -#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) -#define KEYSERVER_HONOR_PKA_RECORD (1<<8) +#define KEYSERVER_USE_TEMP_FILES (1<<0) +#define KEYSERVER_KEEP_TEMP_FILES (1<<1) +#define KEYSERVER_ADD_FAKE_V3 (1<<2) +#define KEYSERVER_AUTO_KEY_RETRIEVE (1<<3) +#define KEYSERVER_HONOR_KEYSERVER_URL (1<<4) +#define KEYSERVER_HONOR_PKA_RECORD (1<<5) #endif /*G10_OPTIONS_H*/ |