nss-pam-ldapd commit: r1851 - in debian/nss-pam-ldapd/branches/wheezy/debian: . patches

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

Author: arthur
Date: Sun Dec  9 15:28:53 2012
New Revision: 1851
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=1851&view=revision

Log:
update patch to fix a problem in the timeout calculation used in the 
communication protocol between nslcd and the NSS and PAM modules, thanks Julien 
Cristau

Modified:
   debian/nss-pam-ldapd/branches/wheezy/debian/changelog
   
debian/nss-pam-ldapd/branches/wheezy/debian/patches/01-use-poll-instead-of-select.patch

Modified: debian/nss-pam-ldapd/branches/wheezy/debian/changelog
==============================================================================
--- debian/nss-pam-ldapd/branches/wheezy/debian/changelog       Sat Dec  8 
23:48:22 2012        (r1850)
+++ debian/nss-pam-ldapd/branches/wheezy/debian/changelog       Sun Dec  9 
15:28:53 2012        (r1851)
@@ -1,3 +1,11 @@
+nss-pam-ldapd (0.8.10-4) UNRELEASED; urgency=low
+
+  * 01-use-poll-instead-of-select.patch: update patch to fix a problem in
+    the timeout calculation used in the communication protocol between
+    nslcd and the NSS and PAM modules, thanks Julien Cristau
+
+ -- Arthur de Jong <adejong@debian.org>  Sat, 09 Dec 2012 15:15:00 +0100
+
 nss-pam-ldapd (0.8.10-3) unstable; urgency=low
 
   * fix a problem in sed logic for commenting out disabled options

Modified: 
debian/nss-pam-ldapd/branches/wheezy/debian/patches/01-use-poll-instead-of-select.patch
==============================================================================
--- 
debian/nss-pam-ldapd/branches/wheezy/debian/patches/01-use-poll-instead-of-select.patch
     Sat Dec  8 23:48:22 2012        (r1850)
+++ 
debian/nss-pam-ldapd/branches/wheezy/debian/patches/01-use-poll-instead-of-select.patch
     Sun Dec  9 15:28:53 2012        (r1851)
@@ -3,9 +3,11 @@
  select() to also correctly do name lookups if more than FD_SETSIZE files
  are already open.
  .
- These changes are part of the 0.8.11 release.
+ These changes are part of the 0.8.11 release and one part contributed
+ by Julien Cristau which will be part of 0.8.13.
 Author: Arthur de Jong <arthur@arthurdejong.org>
 Origin: upstream, 
http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=1783&view=revision
+        upstream, 
http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=1850&view=revision
 Bug-Debian: http://bugs.debian.org/690319
 
 --- a/common/tio.h
@@ -72,7 +74,7 @@
    }
 -  tio_tv_add(deadline,timeout);
 +  deadline->tv_sec+=timeout/1000;
-+  deadline->tv_sec+=(timeout%1000)*1000;
++  deadline->tv_usec+=(timeout%1000)*1000;
  }
  
 -/* update the timeval to the value that is remaining before deadline
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/