diff options
| author | Sumit Bose <sbose@redhat.com> | 2011-01-12 11:32:42 +0100 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2011-01-17 07:59:55 -0500 |
| commit | 29993ce4fbdf08f28077f4b6824c8b6b8d616cb8 (patch) | |
| tree | 56371c4fe51ae5a8136a5ed1c7572b3a561c5d31 /src/providers/ldap | |
| parent | a530a96721d8106a6839b6b643b0abc5d7a7b9e0 (diff) | |
| download | sssd-29993ce4fbdf08f28077f4b6824c8b6b8d616cb8.tar.gz sssd-29993ce4fbdf08f28077f4b6824c8b6b8d616cb8.tar.xz sssd-29993ce4fbdf08f28077f4b6824c8b6b8d616cb8.zip | |
Add ldap_search_enumeration_timeout config option
Diffstat (limited to 'src/providers/ldap')
| -rw-r--r-- | src/providers/ldap/ldap_common.c | 5 | ||||
| -rw-r--r-- | src/providers/ldap/ldap_id_enum.c | 4 | ||||
| -rw-r--r-- | src/providers/ldap/sdap.h | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/providers/ldap/ldap_common.c b/src/providers/ldap/ldap_common.c index c98dd4ff3..6daf2c9f5 100644 --- a/src/providers/ldap/ldap_common.c +++ b/src/providers/ldap/ldap_common.c @@ -39,7 +39,7 @@ struct dp_option default_basic_opts[] = { { "ldap_default_bind_dn", DP_OPT_STRING, NULL_STRING, NULL_STRING }, { "ldap_default_authtok_type", DP_OPT_STRING, NULL_STRING, NULL_STRING}, { "ldap_default_authtok", DP_OPT_BLOB, NULL_BLOB, NULL_BLOB }, - { "ldap_search_timeout", DP_OPT_NUMBER, { .number = 60 }, NULL_NUMBER }, + { "ldap_search_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER }, { "ldap_network_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER }, { "ldap_opt_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER }, { "ldap_tls_reqcert", DP_OPT_STRING, { "hard" }, NULL_STRING }, @@ -77,7 +77,8 @@ struct dp_option default_basic_opts[] = { { "ldap_account_expire_policy", DP_OPT_STRING, NULL_STRING, NULL_STRING }, { "ldap_access_order", DP_OPT_STRING, { "filter" }, NULL_STRING }, { "ldap_chpass_uri", DP_OPT_STRING, NULL_STRING, NULL_STRING }, - { "ldap_chpass_dns_service_name", DP_OPT_STRING, NULL_STRING, NULL_STRING } + { "ldap_chpass_dns_service_name", DP_OPT_STRING, NULL_STRING, NULL_STRING }, + { "ldap_enumeration_search_timeout", DP_OPT_NUMBER, { .number = 60 }, NULL_NUMBER } }; struct sdap_attr_map generic_attr_map[] = { diff --git a/src/providers/ldap/ldap_id_enum.c b/src/providers/ldap/ldap_id_enum.c index 3335f70d0..f47ee9fbe 100644 --- a/src/providers/ldap/ldap_id_enum.c +++ b/src/providers/ldap/ldap_id_enum.c @@ -473,7 +473,7 @@ static struct tevent_req *enum_users_send(TALLOC_CTX *memctx, sdap_id_op_handle(state->op), state->attrs, state->filter, dp_opt_get_int(state->ctx->opts->basic, - SDAP_SEARCH_TIMEOUT)); + SDAP_ENUM_SEARCH_TIMEOUT)); if (!subreq) { ret = ENOMEM; goto fail; @@ -577,7 +577,7 @@ static struct tevent_req *enum_groups_send(TALLOC_CTX *memctx, state->ctx->opts, sdap_id_op_handle(state->op), state->attrs, state->filter, dp_opt_get_int(state->ctx->opts->basic, - SDAP_SEARCH_TIMEOUT)); + SDAP_ENUM_SEARCH_TIMEOUT)); if (!subreq) { ret = ENOMEM; goto fail; diff --git a/src/providers/ldap/sdap.h b/src/providers/ldap/sdap.h index 57865fe09..9ef9b70c7 100644 --- a/src/providers/ldap/sdap.h +++ b/src/providers/ldap/sdap.h @@ -191,6 +191,7 @@ enum sdap_basic_opt { SDAP_ACCESS_ORDER, SDAP_CHPASS_URI, SDAP_CHPASS_DNS_SERVICE_NAME, + SDAP_ENUM_SEARCH_TIMEOUT, SDAP_OPTS_BASIC /* opts counter */ }; |