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/ipa | |
| 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/ipa')
| -rw-r--r-- | src/providers/ipa/ipa_access.c | 6 | ||||
| -rw-r--r-- | src/providers/ipa/ipa_common.c | 5 | ||||
| -rw-r--r-- | src/providers/ipa/ipa_common.h | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/providers/ipa/ipa_access.c b/src/providers/ipa/ipa_access.c index 61caef10e..feddc87dd 100644 --- a/src/providers/ipa/ipa_access.c +++ b/src/providers/ipa/ipa_access.c @@ -545,7 +545,7 @@ struct tevent_req *hbac_get_service_data_send(TALLOC_CTX *memctx, NULL, 0, dp_opt_get_int( hbac_ctx_sdap_id_ctx(state->hbac_ctx)->opts->basic, - SDAP_SEARCH_TIMEOUT)); + SDAP_ENUM_SEARCH_TIMEOUT)); if (subreq == NULL) { DEBUG(1, ("sdap_get_generic_send failed.\n")); @@ -842,7 +842,7 @@ static struct tevent_req *hbac_get_host_info_send(TALLOC_CTX *memctx, NULL, 0, dp_opt_get_int( hbac_ctx_sdap_id_ctx(state->hbac_ctx)->opts->basic, - SDAP_SEARCH_TIMEOUT)); + SDAP_ENUM_SEARCH_TIMEOUT)); if (subreq == NULL) { DEBUG(1, ("sdap_get_generic_send failed.\n")); @@ -1163,7 +1163,7 @@ static struct tevent_req *hbac_get_rules_send(TALLOC_CTX *memctx, NULL, 0, dp_opt_get_int( hbac_ctx_sdap_id_ctx(state->hbac_ctx)->opts->basic, - SDAP_SEARCH_TIMEOUT)); + SDAP_ENUM_SEARCH_TIMEOUT)); if (subreq == NULL) { DEBUG(1, ("sdap_get_generic_send failed.\n")); diff --git a/src/providers/ipa/ipa_common.c b/src/providers/ipa/ipa_common.c index a42cc3b4d..4c96babc1 100644 --- a/src/providers/ipa/ipa_common.c +++ b/src/providers/ipa/ipa_common.c @@ -43,7 +43,7 @@ struct dp_option ipa_def_ldap_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 }, @@ -81,7 +81,8 @@ struct dp_option ipa_def_ldap_opts[] = { { "ldap_account_expire_policy", DP_OPT_STRING, NULL_STRING, NULL_STRING }, { "ldap_access_order", DP_OPT_STRING, NULL_STRING, 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 ipa_attr_map[] = { diff --git a/src/providers/ipa/ipa_common.h b/src/providers/ipa/ipa_common.h index 4d79c03c5..49618f019 100644 --- a/src/providers/ipa/ipa_common.h +++ b/src/providers/ipa/ipa_common.h @@ -35,7 +35,7 @@ struct ipa_service { /* the following defines are used to keep track of the options in the ldap * module, so that if they change and ipa is not updated correspondingly * this will trigger a runtime abort error */ -#define IPA_OPTS_BASIC_TEST 43 +#define IPA_OPTS_BASIC_TEST 44 /* the following define is used to keep track of the options in the krb5 * module, so that if they change and ipa is not updated correspondingly |