diff options
| author | Werner Koch <[email protected]> | 2017-11-07 09:02:53 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-11-07 09:05:18 +0000 |
| commit | 30f21f8b0fa6844a9bba3f24dc41b3ac32170109 (patch) | |
| tree | 5d7ac1baef9583deebbb28e28382ae63f62f213a | |
| parent | speedo: Include software versions in the W32 README (diff) | |
| download | gnupg-30f21f8b0fa6844a9bba3f24dc41b3ac32170109.tar.gz gnupg-30f21f8b0fa6844a9bba3f24dc41b3ac32170109.zip | |
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 <[email protected]>
(cherry picked from commit ab7ac827041b5cd97bbca7a75b0930072dd6611f)
GnuPG-bug-id: 3487
| -rw-r--r-- | dirmngr/dirmngr.c | 2 | ||||
| -rw-r--r-- | dirmngr/dirmngr_ldap.c | 2 | ||||
| -rw-r--r-- | doc/dirmngr.texi | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index 0d133c61b..5317c214a 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 5a9ae977c..5be4e5814 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 eef78a8b7..9654a0e74 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 |