From 732f3d1d4786239db5f31f82cc04ec79326cc13c Mon Sep 17 00:00:00 2001 From: David Shaw Date: Tue, 18 Dec 2012 00:08:51 -0500 Subject: [PATCH] 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. --- keyserver/gpgkeys_hkp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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. */