From 4e0314ecad0fb649bcc2d6384a84ae818ef7c972 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Thu, 1 Oct 2009 07:10:11 -0400 Subject: Fix long timeout on ldap operation Always use the network timeout defined in the options. But raise defaults to 60 seconds or enumerations can easily fail. --- server/providers/ldap/sdap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'server/providers/ldap/sdap.c') diff --git a/server/providers/ldap/sdap.c b/server/providers/ldap/sdap.c index cc435ce00..b2dc6f6ff 100644 --- a/server/providers/ldap/sdap.c +++ b/server/providers/ldap/sdap.c @@ -36,8 +36,8 @@ struct sdap_gen_opts default_basic_opts[] = { { "ldap_default_bind_dn", SDAP_STRING, NULL_STRING, NULL_STRING }, { "ldap_default_authtok_type", SDAP_STRING, NULL_STRING, NULL_STRING}, { "ldap_default_authtok", SDAP_BLOB, NULL_BLOB, NULL_BLOB }, - { "ldap_network_timeout", SDAP_NUMBER, { .number = 5 }, NULL_NUMBER }, - { "ldap_opt_timeout", SDAP_NUMBER, { .number = 5 }, NULL_NUMBER }, + { "ldap_network_timeout", SDAP_NUMBER, { .number = 60 }, NULL_NUMBER }, + { "ldap_opt_timeout", SDAP_NUMBER, { .number = 60 }, NULL_NUMBER }, { "ldap_tls_reqcert", SDAP_STRING, { "hard" }, NULL_STRING }, { "ldap_user_search_base", SDAP_STRING, { "ou=People,dc=example,dc=com" }, NULL_STRING }, { "ldap_user_search_scope", SDAP_STRING, { "sub" }, NULL_STRING }, -- cgit