aboutsummaryrefslogtreecommitdiffstats
path: root/g10/hkp.c
diff options
context:
space:
mode:
Diffstat (limited to 'g10/hkp.c')
-rw-r--r--g10/hkp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/g10/hkp.c b/g10/hkp.c
index bcc06fdbf..4a2aa5e00 100644
--- a/g10/hkp.c
+++ b/g10/hkp.c
@@ -53,7 +53,7 @@ hkp_ask_import( KEYDB_SEARCH_DESC *desc, void *stats_handle)
struct http_context hd;
char *request;
int rc;
- unsigned int hflags = opt.honor_http_proxy? HTTP_FLAG_TRY_PROXY : 0;
+ unsigned int hflags = opt.keyserver_options.honor_http_proxy? HTTP_FLAG_TRY_PROXY : 0;
u32 key[2];
if(desc->mode==KEYDB_SEARCH_MODE_FPR20)
@@ -77,7 +77,7 @@ hkp_ask_import( KEYDB_SEARCH_DESC *desc, void *stats_handle)
* binary mode ... how?
*/
- if(ascii_strcasecmp(opt.keyserver_scheme,"x-broken-hkp")==0)
+ if(opt.keyserver_options.broken_http_proxy)
hflags |= HTTP_FLAG_NO_SHUTDOWN;
sprintf(request,"x-hkp://%s%s%s/pks/lookup?op=get&search=0x%08lX",
@@ -113,7 +113,7 @@ hkp_export( STRLIST users )
struct http_context hd;
char *request;
unsigned int status;
- unsigned int hflags = opt.honor_http_proxy? HTTP_FLAG_TRY_PROXY : 0;
+ unsigned int hflags = opt.keyserver_options.honor_http_proxy? HTTP_FLAG_TRY_PROXY : 0;
iobuf_push_filter( temp, urlencode_filter, NULL );
@@ -131,7 +131,7 @@ hkp_export( STRLIST users )
request = m_alloc( strlen( opt.keyserver_host ) + 100 );
- if(ascii_strcasecmp(opt.keyserver_scheme,"x-broken-hkp")==0)
+ if(opt.keyserver_options.broken_http_proxy)
hflags |= HTTP_FLAG_NO_SHUTDOWN;
sprintf( request, "x-hkp://%s%s%s/pks/add",
@@ -449,7 +449,7 @@ int hkp_search(STRLIST tokens)
char *request;
#endif
struct http_context hd;
- unsigned int hflags=opt.honor_http_proxy?HTTP_FLAG_TRY_PROXY:0;
+ unsigned int hflags=opt.keyserver_options.honor_http_proxy?HTTP_FLAG_TRY_PROXY:0;
byte *line=NULL;
/* Glue the tokens together to make a search string */
@@ -512,7 +512,7 @@ int hkp_search(STRLIST tokens)
request=m_alloc(strlen(opt.keyserver_host) + 100 + strlen(searchurl));
- if(ascii_strcasecmp(opt.keyserver_scheme,"x-broken-hkp")==0)
+ if(opt.keyserver_options.broken_http_proxy)
hflags |= HTTP_FLAG_NO_SHUTDOWN;
sprintf(request,"x-hkp://%s%s%s/pks/lookup?op=index&search=%s",