diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-11 14:56:12 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-11 14:56:12 +0000 |
| commit | 9a5838edad5f5d59e54da2e9e7e20d62ae2e6069 (patch) | |
| tree | bcc8b34cf4c67262d32ef536a561a171f7083a9a /res/res_config_ldap.c | |
| parent | 189da9a72901ea4b14e45410d87a3cf8e8fbc8f1 (diff) | |
Merged revisions 114061 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r114061 | tilghman | 2008-04-11 09:54:22 -0500 (Fri, 11 Apr 2008) | 6 lines
Errors are all greater than 0
(closes issue #12422)
Reported by: nito
Patches:
res_config_ldap_result_check_patch.diff uploaded by nito (license 340)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114062 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_config_ldap.c')
| -rw-r--r-- | res/res_config_ldap.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c index 79a326b20..3344b3deb 100644 --- a/res/res_config_ldap.c +++ b/res/res_config_ldap.c @@ -552,7 +552,7 @@ static struct ast_variable *ldap_loadentry(struct ldap_table_config *table_confi do { result = ldap_search_ext_s(ldapConn, dn, LDAP_SCOPE_BASE, "(objectclass=*)", NULL, 0, NULL, NULL, NULL, LDAP_NO_LIMIT, &ldap_result); - if (result < 0 && is_ldap_connect_error(result)) { + if (result != LDAP_SUCCESS && is_ldap_connect_error(result)) { ast_log(LOG_WARNING, "Failed to query database. Try %d/3\n", tries + 1); @@ -567,9 +567,9 @@ static struct ast_variable *ldap_loadentry(struct ldap_table_config *table_confi break; } } - } while (result < 0 && tries < 3 && is_ldap_connect_error(result)); + } while (result != LDAP_SUCCESS && tries < 3 && is_ldap_connect_error(result)); - if (result < 0) { + if (result != LDAP_SUCCESS) { ast_log(LOG_WARNING, "Failed to query database. Check debug for more info.\n"); ast_debug(2, "dn=%s\n", dn); @@ -787,7 +787,7 @@ static struct ast_variable **realtime_ldap_base_ap(unsigned int *entries_count_p result = ldap_search_ext_s(ldapConn, clean_basedn, LDAP_SCOPE_SUBTREE, filter->str, NULL, 0, NULL, NULL, NULL, LDAP_NO_LIMIT, &ldap_result); - if (result < 0 && is_ldap_connect_error(result)) { + if (result != LDAP_SUCCESS && is_ldap_connect_error(result)) { ast_log(LOG_DEBUG, "Failed to query database. Try %d/10\n", tries + 1); if (++tries < 10) { @@ -800,9 +800,9 @@ static struct ast_variable **realtime_ldap_base_ap(unsigned int *entries_count_p break; } } - } while (result < 0 && tries < 10 && is_ldap_connect_error(result)); + } while (result != LDAP_SUCCESS && tries < 10 && is_ldap_connect_error(result)); - if (result < 0) { + if (result != LDAP_SUCCESS) { ast_log(LOG_WARNING, "Failed to query database. Check debug for more info.\n"); ast_log(LOG_WARNING, "Query: %s\n", filter->str); ast_log(LOG_WARNING, "Query Failed because: %s\n", ldap_err2string(result)); @@ -1244,7 +1244,7 @@ static int update_ldap(const char *basedn, const char *table_name, const char *a result = ldap_search_ext_s(ldapConn, clean_basedn, LDAP_SCOPE_SUBTREE, filter->str, NULL, 0, NULL, NULL, NULL, LDAP_NO_LIMIT, &ldap_result); - if (result < 0 && is_ldap_connect_error(result)) { + if (result != LDAP_SUCCESS && is_ldap_connect_error(result)) { ast_log(LOG_WARNING, "Failed to query database. Try %d/3\n", tries + 1); tries++; @@ -1258,9 +1258,9 @@ static int update_ldap(const char *basedn, const char *table_name, const char *a break; } } - } while (result < 0 && tries < 3 && is_ldap_connect_error(result)); + } while (result != LDAP_SUCCESS && tries < 3 && is_ldap_connect_error(result)); - if (result < 0) { + if (result != LDAP_SUCCESS) { ast_log(LOG_WARNING, "Failed to query directory. Check debug for more info.\n"); ast_log(LOG_WARNING, "Query: %s\n", filter->str); ast_log(LOG_WARNING, "Query Failed because: %s\n", |