[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.19-49-g732f3d1

[by David Shaw]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-2-0 has been updated
       via  732f3d1d4786239db5f31f82cc04ec79326cc13c (commit)
      from  6b1f71055ebab36989e2089cfde319d2ba40ada7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 732f3d1d4786239db5f31f82cc04ec79326cc13c
Author: David Shaw <dshaw at jabberwocky.com>
Date:   Tue Dec 18 00:08:51 2012 -0500

    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.

diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c
index 8e35783..73f5e56 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.  */

-----------------------------------------------------------------------

Summary of changes:
 keyserver/gpgkeys_hkp.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org