nss-pam-ldapd commit: r1854 - in debian/nss-pam-ldapd/trunk/debian: . patches

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

Author: arthur
Date: Sun Dec  9 20:03:51 2012
New Revision: 1854
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=1854&view=revision

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

Added:
   debian/nss-pam-ldapd/trunk/debian/patches/
   
debian/nss-pam-ldapd/trunk/debian/patches/01-fix-set-usec-instead-of-sec.patch
   debian/nss-pam-ldapd/trunk/debian/patches/series
Modified:
   debian/nss-pam-ldapd/trunk/debian/changelog

Modified: debian/nss-pam-ldapd/trunk/debian/changelog
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/changelog Sun Dec  9 16:03:11 2012        
(r1853)
+++ debian/nss-pam-ldapd/trunk/debian/changelog Sun Dec  9 20:03:51 2012        
(r1854)
@@ -11,8 +11,11 @@
       accidentally got hidden in 0.7.4)
     - small improvement to PAM error logging
   * added Turkish debconf translation by Atila KOÇ (closes: #694420)
+  * 01-fix-set-usec-instead-of-sec.patch: 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>  Tue, 27 Nov 2012 23:00:00 +0100
+ -- Arthur de Jong <adejong@debian.org>  Sun, 09 Dec 2012 20:00:00 +0100
 
 nss-pam-ldapd (0.8.11-1) experimental; urgency=low
 

Added: 
debian/nss-pam-ldapd/trunk/debian/patches/01-fix-set-usec-instead-of-sec.patch
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ 
debian/nss-pam-ldapd/trunk/debian/patches/01-fix-set-usec-instead-of-sec.patch  
    Sun Dec  9 20:03:51 2012        (r1854)
@@ -0,0 +1,24 @@
+Description: Correctly set usec field of daedline instead of sec
+ Found by Julien Cristau when reviewing
+ 01-use-poll-instead-of-select.patch which was based on functionality that
+ went into 0.8.13. The deadline calculation incorrectly saves the
+ calculated micosecondsecond value in the second value possibly causing a
+ very long delay. The long delay is avoided by other sanity checking code
+ in place.
+Author: Julien Cristau <jcristau@debian.org>
+Origin: other, http://bugs.debian.org/691640
+Forwarded: not-needed
+Applied-Upstream: commit, 
http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=1850&view=revision
+Reviewed-by: Arthur de Jong <arthur@arthurdejong.org>
+
+--- a/common/tio.c
++++ b/common/tio.c
+@@ -86,7 +86,7 @@ static inline void tio_get_deadline(stru
+     return;
+   }
+   deadline->tv_sec+=timeout/1000;
+-  deadline->tv_sec+=(timeout%1000)*1000;
++  deadline->tv_usec+=(timeout%1000)*1000;
+ }
+ 
+ /* update the timeout to the value that is remaining before deadline

Added: debian/nss-pam-ldapd/trunk/debian/patches/series
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ debian/nss-pam-ldapd/trunk/debian/patches/series    Sun Dec  9 20:03:51 
2012        (r1854)
@@ -0,0 +1 @@
+01-fix-set-usec-instead-of-sec.patch
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/