nss-pam-ldapd commit: r1320 - in nss-pam-ldapd-0.7: . nslcd

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

Author: arthur
Date: Fri Dec 10 15:49:30 2010
New Revision: 1320
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1320

Log:
call myldap_session_check() before adding a new search to the session so the 
connection actually gets closed on timeout (the connection isn't closed when 
there are active searches) (r1294 from trunk)

Modified:
   nss-pam-ldapd-0.7/   (props changed)
   nss-pam-ldapd-0.7/nslcd/myldap.c

Modified: nss-pam-ldapd-0.7/nslcd/myldap.c
==============================================================================
--- nss-pam-ldapd-0.7/nslcd/myldap.c    Wed Dec  8 23:54:06 2010        (r1319)
+++ nss-pam-ldapd-0.7/nslcd/myldap.c    Fri Dec 10 15:49:30 2010        (r1320)
@@ -638,8 +638,6 @@
   int rc;
   int sd=-1;
   int off=0;
-  /* check if the idle time for the connection has expired */
-  myldap_session_check(session);
   /* if the connection is still there (ie. ldap_unbind() wasn't
      called) then we can return the cached connection */
   if (session->ld!=NULL)
@@ -932,6 +930,8 @@
   /* log the call */
   log_log(LOG_DEBUG,"myldap_search(base=\"%s\", filter=\"%s\")",
                     base,filter);
+  /* check if the idle time for the connection has expired */
+  myldap_session_check(session);
   /* allocate a new search entry */
   search=myldap_search_new(session,base,scope,filter,attrs);
   /* find a place in the session where we can register our search */
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits