security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

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@gnupg.org>
This commit is contained in:
Werner Koch 2017-11-07 10:02:53 +01:00
parent f9f72ffbfa
commit ab7ac82704
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dirmngr/dirmngr.c
View File

@ -279,7 +279,7 @@ static struct debug_flags_s debug_flags [] =
}; };
#define DEFAULT_MAX_REPLIES 10 #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_TIMEOUT (15*1000) /* 15 seconds */
#define DEFAULT_CONNECT_QUICK_TIMEOUT ( 2*1000) /* 2 seconds */ #define DEFAULT_CONNECT_QUICK_TIMEOUT ( 2*1000) /* 2 seconds */

2
dirmngr/dirmngr_ldap.c
View File

@ -104,7 +104,7 @@ static void npth_protect (void) { }
typedef struct timeval my_ldap_timeval_t; typedef struct timeval my_ldap_timeval_t;
#endif #endif
#define DEFAULT_LDAP_TIMEOUT 100 /* Arbitrary long timeout. */ #define DEFAULT_LDAP_TIMEOUT 15 /* Arbitrary long timeout. */
/* Constants for the options. */ /* Constants for the options. */

2
doc/dirmngr.texi
View File

@ -416,7 +416,7 @@ percent-escaped strings.}
@item --ldaptimeout @var{secs} @item --ldaptimeout @var{secs}
@opindex ldaptimeout @opindex ldaptimeout
Specify the number of seconds to wait for an LDAP query before timing 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 @item --add-servers