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

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

Author: arthur
Date: Wed Feb 29 22:44:31 2012
New Revision: 1625
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=1625&view=revision

Log:
log the first 10 search results in debug mode to make debugging easier (patch 
by Matthijs Kooijman)

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

Modified: nss-pam-ldapd/nslcd/myldap.c
==============================================================================
--- nss-pam-ldapd/nslcd/myldap.c        Wed Feb 29 22:26:05 2012        (r1624)
+++ nss-pam-ldapd/nslcd/myldap.c        Wed Feb 29 22:44:31 2012        (r1625)
@@ -75,6 +75,9 @@
 /* the maximum number of searches per session */
 #define MAX_SEARCHES_IN_SESSION 4
 
+/* the maximum number of dn's to log to the debug log for each search */
+#define MAX_DEBUG_LOG_DNS 10
+
 /* This refers to a current LDAP session that contains the connection
    information. */
 struct ldap_session
@@ -116,6 +119,8 @@
   struct berval *cookie;
   /* to indicate that we can retry the search from myldap_get_entry() */
   int may_retry_search;
+  /* the number of resutls returned so far */
+  int count;
 };
 
 /* The maximum number of calls to myldap_get_values() that may be
@@ -249,6 +254,7 @@
   search->may_retry_search=1;
   /* clear result entry */
   search->entry=NULL;
+  search->count=0;
   /* return the new search struct */
   return search;
 }
@@ -1116,6 +1122,11 @@
         search->entry=myldap_entry_new(search);
         if (rcp!=NULL)
           *rcp=LDAP_SUCCESS;
+        /* log the first couple of dns in the result (but not all, to
+           prevent swamping the log) */
+        if (search->count<MAX_DEBUG_LOG_DNS)
+          log_log(LOG_DEBUG,"ldap_result(): %s",myldap_get_dn(search->entry));
+        search->count++;
         search->may_retry_search=0;
         return search->entry;
       case LDAP_RES_SEARCH_RESULT:
@@ -1178,7 +1189,11 @@
         /* check if there are more pages to come */
         if ((search->cookie==NULL)||(search->cookie->bv_len==0))
         {
-          log_log(LOG_DEBUG,"ldap_result(): end of results");
+          if (search->count>MAX_DEBUG_LOG_DNS)
+            log_log(LOG_DEBUG,"ldap_result(): ... %d more results",
+                              search->count-MAX_DEBUG_LOG_DNS);
+          log_log(LOG_DEBUG,"ldap_result(): end of results (%d total)",
+                            search->count);
           /* we are at the end of the search, no more results */
           myldap_search_close(search);
           if (rcp!=NULL)
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/