diff options
| author | David Shaw <[email protected]> | 2012-12-18 05:08:51 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2012-12-18 05:08:51 +0000 |
| commit | 732f3d1d4786239db5f31f82cc04ec79326cc13c (patch) | |
| tree | 2cde9dc193e94f9b55a43793b33285ab28f4cdd1 | |
| parent | Issue 1447: Pass proper Host header and SNI when SRV is used with curl. (diff) | |
| download | gnupg-732f3d1d4786239db5f31f82cc04ec79326cc13c.tar.gz gnupg-732f3d1d4786239db5f31f82cc04ec79326cc13c.zip | |
No point in defaulting try-dns-srv to on if we don't have SRV support.
* keyserver/gpgkeys_hkp.c (main): Only default try-dns-srv to on if we
have SRV support in the first place.
| -rw-r--r-- | keyserver/gpgkeys_hkp.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c index 8e35783c7..73f5e560c 100644 --- a/keyserver/gpgkeys_hkp.c +++ b/keyserver/gpgkeys_hkp.c @@ -629,13 +629,20 @@ show_help (FILE *fp) int main(int argc,char *argv[]) { - int arg,ret=KEYSERVER_INTERNAL_ERROR,try_srv=1; + int arg,ret=KEYSERVER_INTERNAL_ERROR; char line[MAX_LINE]; int failed=0; struct keylist *keylist=NULL,*keyptr=NULL; char *proxy=NULL; struct curl_slist *headers=NULL,*resolve=NULL; + /* Only default this to on if we have SRV support */ +#ifdef USE_DNS_SRV + int try_srv = 1; +#else + int try_srv = 0; +#endif + console=stderr; /* Kludge to implement standard GNU options. */ |