nss-pam-ldapd commit: r1153 - nss-pam-ldapd/nslcd

["Commits of the nss-pam-ldapd project." <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Sat Jun 19 21:42:43 2010
New Revision: 1153
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1153

Log:
improve debug logging of SASL bind calls

Modified:
   nss-pam-ldapd/nslcd/myldap.c

Modified: nss-pam-ldapd/nslcd/myldap.c
==============================================================================
--- nss-pam-ldapd/nslcd/myldap.c        Sat Jun 19 21:03:49 2010        (r1152)
+++ nss-pam-ldapd/nslcd/myldap.c        Sat Jun 19 21:42:43 2010        (r1153)
@@ -401,14 +401,18 @@
   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 @@
       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 */
   }
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits