[Pkg-gnupg-commit] [gnupg2] 41/49: dirmngr: Reduce default LDAP timeout to 15 seconds.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 30f21f8b0fa6844a9bba3f24dc41b3ac32170109
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Nov 7 10:02:53 2017 +0100

    dirmngr: Reduce default LDAP timeout to 15 seconds.
    
    * dirmngr/dirmngr.c (DEFAULT_LDAP_TIMEOUT): Change to 15.
    * dirmngr/dirmngr_ldap.c (DEFAULT_LDAP_TIMEOUT): Ditto.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
    (cherry picked from commit ab7ac827041b5cd97bbca7a75b0930072dd6611f)
    GnuPG-bug-id: 3487
---
 dirmngr/dirmngr.c      | 2 +-
 dirmngr/dirmngr_ldap.c | 2 +-
 doc/dirmngr.texi       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 0d133c6..5317c21 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -279,7 +279,7 @@ static struct debug_flags_s debug_flags [] =
   };
 
 #define DEFAULT_MAX_REPLIES 10
-#define DEFAULT_LDAP_TIMEOUT 100 /* arbitrary large timeout */
+#define DEFAULT_LDAP_TIMEOUT 15  /* seconds */
 
 #define DEFAULT_CONNECT_TIMEOUT       (15*1000)  /* 15 seconds */
 #define DEFAULT_CONNECT_QUICK_TIMEOUT ( 2*1000)  /*  2 seconds */
diff --git a/dirmngr/dirmngr_ldap.c b/dirmngr/dirmngr_ldap.c
index 5a9ae97..5be4e58 100644
--- a/dirmngr/dirmngr_ldap.c
+++ b/dirmngr/dirmngr_ldap.c
@@ -104,7 +104,7 @@ static void npth_protect (void) { }
  typedef struct timeval my_ldap_timeval_t;
 #endif
 
-#define DEFAULT_LDAP_TIMEOUT 100 /* Arbitrary long timeout. */
+#define DEFAULT_LDAP_TIMEOUT 15 /* Arbitrary long timeout. */
 
 
 /* Constants for the options.  */
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index eef78a8..9654a0e 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -416,7 +416,7 @@ percent-escaped strings.}
 @item --ldaptimeout @var{secs}
 @opindex ldaptimeout
 Specify the number of seconds to wait for an LDAP query before timing
-out. The default is currently 100 seconds.  0 will never timeout.
+out.  The default are 15 seconds.  0 will never timeout.
 
 
 @item --add-servers

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git