diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2010-06-19 21:42:43 +0200 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2010-06-19 21:42:43 +0200 |
| commit | b8a2cd6eb647ce2e69b041aab7814e0c3cb2ee13 (patch) | |
| tree | 51a042373f24c98484badc6f8250b63ba132b83e /nslcd/myldap.c | |
| parent | 431c493f7c60ac3cb3f4553d45153c072aadc2dc (diff) | |
improve debug logging of SASL bind calls
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1153 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd/myldap.c')
| -rw-r--r-- | nslcd/myldap.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/nslcd/myldap.c b/nslcd/myldap.c index 8fffe58..e9889ac 100644 --- a/nslcd/myldap.c +++ b/nslcd/myldap.c @@ -401,14 +401,18 @@ static int do_bind(MYLDAP_SESSION *session,const char *uri) if (nslcd_cfg->ldc_sasl_mech!=NULL) { /* do a SASL bind */ - log_log(LOG_DEBUG,"SASL bind to %s as %s",uri,nslcd_cfg->ldc_binddn); if (nslcd_cfg->ldc_sasl_secprops!=NULL) { log_log(LOG_DEBUG,"ldap_set_option(LDAP_OPT_X_SASL_SECPROPS,\"%s\")",nslcd_cfg->ldc_sasl_secprops); LDAP_SET_OPTION(session->ld,LDAP_OPT_X_SASL_SECPROPS,(void *)nslcd_cfg->ldc_sasl_secprops); } #ifdef HAVE_SASL_INTERACT_T - log_log(LOG_DEBUG,"ldap_sasl_interactive_bind_s(\"%s\",\"%s\")",nslcd_cfg->ldc_binddn,nslcd_cfg->ldc_sasl_mech); + if (nslcd_cfg->ldc_binddn!=NULL) + log_log(LOG_DEBUG,"ldap_sasl_interactive_bind_s(\"%s\",\"%s\") (uri=\"%s\")", + nslcd_cfg->ldc_binddn,nslcd_cfg->ldc_sasl_mech,uri); + else + log_log(LOG_DEBUG,"ldap_sasl_interactive_bind_s(NULL,\"%s\") (uri=\"%s\")", + nslcd_cfg->ldc_sasl_mech,uri); return ldap_sasl_interactive_bind_s(session->ld,nslcd_cfg->ldc_binddn,nslcd_cfg->ldc_sasl_mech,NULL,NULL, LDAP_SASL_QUIET, do_sasl_interact,(void *)nslcd_cfg); @@ -423,8 +427,14 @@ static int do_bind(MYLDAP_SESSION *session,const char *uri) cred.bv_val=""; cred.bv_len=0; } - log_log(LOG_DEBUG,"ldap_sasl_bind_s(\"%s\",\"%s\",%s)",nslcd_cfg->ldc_binddn, - nslcd_cfg->ldc_sasl_mech,nslcd_cfg->ldc_bindpw?"\"***\"":"NULL"); + if (nslcd_cfg->ldc_binddn!=NULL) + log_log(LOG_DEBUG,"ldap_sasl_bind_s(\"%s\",\"%s\",%s) (uri=\"%s\")", + nslcd_cfg->ldc_binddn,nslcd_cfg->ldc_sasl_mech, + nslcd_cfg->ldc_bindpw?"\"***\"":"NULL",uri); + else + log_log(LOG_DEBUG,"ldap_sasl_bind_s(NULL,\"%s\",%s) (uri=\"%s\")", + nslcd_cfg->ldc_sasl_mech, + nslcd_cfg->ldc_bindpw?"\"***\"":"NULL",uri); return ldap_sasl_bind_s(session->ld,nslcd_cfg->ldc_binddn,nslcd_cfg->ldc_sasl_mech,&cred,NULL,NULL,NULL); #endif /* not HAVE_SASL_INTERACT_T */ } |