diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2010-09-24 09:16:08 +0200 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2010-09-24 09:16:08 +0200 |
| commit | bed19586b722b7291896b31d93730d49a2448c76 (patch) | |
| tree | 6bd7e782b447e5adb7705abf48a59de84fb02be5 | |
| parent | f07d7221c448042d575a0b24dc926a358859f638 (diff) | |
handle errors from ldap_result() better and disconnect (and reconnect) in more cases (r1207 and r1208 from trunk)
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd-0.7@1211 ef36b2f9-881f-0410-afb5-c4e39611909c
| -rw-r--r-- | nslcd/myldap.c | 69 |
1 files changed, 37 insertions, 32 deletions
diff --git a/nslcd/myldap.c b/nslcd/myldap.c index e955dd5..9ab58ad 100644 --- a/nslcd/myldap.c +++ b/nslcd/myldap.c @@ -1060,36 +1060,6 @@ MYLDAP_ENTRY *myldap_get_entry(MYLDAP_SEARCH *search,int *rcp) /* handle result */ switch (rc) { - case -1: - /* we have an error condition, try to get error code */ - if (ldap_get_option(search->session->ld,LDAP_OPT_ERROR_NUMBER,&rc)!=LDAP_SUCCESS) - rc=LDAP_UNAVAILABLE; - log_log(LOG_ERR,"ldap_result() failed: %s",ldap_err2string(rc)); - /* close connection on connection problems */ - if ((rc==LDAP_UNAVAILABLE)||(rc==LDAP_SERVER_DOWN)||(rc==LDAP_SUCCESS)) - { - /* close the connection and retry */ - do_close(search->session); - if (search->may_retry_search) - { - log_log(LOG_DEBUG,"myldap_get_entry(): retry search"); - search->may_retry_search=0; - if (do_retry_search(search)==LDAP_SUCCESS) - return myldap_get_entry(search,rcp); - } - } - /* close search */ - myldap_search_close(search); - if (rcp!=NULL) - *rcp=rc; - return NULL; - case 0: - /* the timeout expired */ - log_log(LOG_ERR,"ldap_result() timed out"); - myldap_search_close(search); - if (rcp!=NULL) - *rcp=LDAP_TIMELIMIT_EXCEEDED; - return NULL; case LDAP_RES_SEARCH_ENTRY: /* we have a normal search entry, update timestamp and return result */ time(&(search->session->lastactivity)); @@ -1205,11 +1175,46 @@ MYLDAP_ENTRY *myldap_get_entry(MYLDAP_SEARCH *search,int *rcp) case LDAP_RES_SEARCH_REFERENCE: break; /* just ignore search references */ default: - log_log(LOG_WARNING,"ldap_result() returned unexpected result type"); + /* we have some error condition, find out which */ + switch (rc) + { + case -1: + /* try to get error code */ + if (ldap_get_option(search->session->ld,LDAP_OPT_ERROR_NUMBER,&rc)!=LDAP_SUCCESS) + rc=LDAP_UNAVAILABLE; + log_log(LOG_ERR,"ldap_result() failed: %s",ldap_err2string(rc)); + break; + case 0: + /* the timeout expired */ + log_log(LOG_ERR,"ldap_result() timed out"); + rc=LDAP_TIMELIMIT_EXCEEDED; + break; + default: + /* unknown code */ + log_log(LOG_WARNING,"ldap_result() returned unexpected result type"); + rc=LDAP_PROTOCOL_ERROR; + } + /* close connection on some connection problems */ + if ((rc==LDAP_UNAVAILABLE)||(rc==LDAP_SERVER_DOWN)||(rc==LDAP_SUCCESS)|| + (rc==LDAP_TIMELIMIT_EXCEEDED)|(rc==LDAP_OPERATIONS_ERROR)|| + (rc==LDAP_PROTOCOL_ERROR)) + { + do_close(search->session); + /* retry once if no data has been received yet */ + if (search->may_retry_search) + { + log_log(LOG_DEBUG,"myldap_get_entry(): retry search"); + search->may_retry_search=0; + if (do_retry_search(search)==LDAP_SUCCESS) + return myldap_get_entry(search,rcp); + } + } + /* close search */ myldap_search_close(search); if (rcp!=NULL) - *rcp=LDAP_PROTOCOL_ERROR; + *rcp=rc; return NULL; + } } } |