diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2010-05-09 10:20:23 +0000 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2010-05-09 10:20:23 +0000 |
| commit | 1f1a33c37dbb42e30d6aaa0326b294ab46d6971a (patch) | |
| tree | 003d6c13191acd6651527a7d54766cbc20ce92a1 | |
| parent | 3dd729755e3e113056ed9fad8995bbad37df2593 (diff) | |
don't log errno if it is not set (make error less confusing)
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1093 ef36b2f9-881f-0410-afb5-c4e39611909c
| -rw-r--r-- | nslcd/myldap.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/nslcd/myldap.c b/nslcd/myldap.c index 8ee295c..dec8492 100644 --- a/nslcd/myldap.c +++ b/nslcd/myldap.c @@ -380,8 +380,9 @@ static int do_bind(MYLDAP_SESSION *session,const char *uri) rc=ldap_start_tls_s(session->ld,NULL,NULL); if (rc!=LDAP_SUCCESS) { - log_log(LOG_WARNING,"ldap_start_tls_s() failed: %s: %s (uri=\"%s\")", - ldap_err2string(rc),strerror(errno),uri); + log_log(LOG_WARNING,"ldap_start_tls_s() failed: %s%s%s (uri=\"%s\")", + ldap_err2string(rc),(errno==0)?"":": ", + (errno==0)?"":strerror(errno),uri); return rc; } } @@ -620,9 +621,10 @@ static int do_open(MYLDAP_SESSION *session) rc=ldap_initialize(&(session->ld),nslcd_cfg->ldc_uris[session->current_uri].uri); if (rc!=LDAP_SUCCESS) { - log_log(LOG_WARNING,"ldap_initialize(%s) failed: %s: %s", + log_log(LOG_WARNING,"ldap_initialize(%s) failed: %s%s%s", nslcd_cfg->ldc_uris[session->current_uri].uri, - ldap_err2string(rc),strerror(errno)); + ldap_err2string(rc),(errno==0)?"":": ", + (errno==0)?"":strerror(errno)); if (session->ld!=NULL) { log_log(LOG_DEBUG,"ldap_unbind()"); @@ -655,9 +657,10 @@ static int do_open(MYLDAP_SESSION *session) { /* log actual LDAP error code */ log_log((session->binddn[0]=='\0')?LOG_WARNING:LOG_DEBUG, - "failed to bind to LDAP server %s: %s: %s", + "failed to bind to LDAP server %s: %s%s%s", nslcd_cfg->ldc_uris[session->current_uri].uri, - ldap_err2string(rc),strerror(errno)); + ldap_err2string(rc),(errno==0)?"":": ", + (errno==0)?"":strerror(errno)); rc2=ldap_unbind(session->ld); session->ld=NULL; if (rc2!=LDAP_SUCCESS) |