samba-cvs.cvs
[Top] [All Lists]

svn commit: samba r14760 - in branches/SAMBA_3_0/source/nsswitch: .

Subject: svn commit: samba r14760 - in branches/SAMBA_3_0/source/nsswitch: .
From: jra@xxxxxxxxx
Date: Wed, 29 Mar 2006 18:55:40 +0000 (GMT)
Author: jra
Date: 2006-03-29 18:55:39 +0000 (Wed, 29 Mar 2006)
New Revision: 14760

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14760

Log:
Fix #3642, ensure we don't call FD_SET on read with fd == -1.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/nsswitch/wb_common.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/wb_common.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/wb_common.c      2006-03-29 18:53:58 UTC 
(rev 14759)
+++ branches/SAMBA_3_0/source/nsswitch/wb_common.c      2006-03-29 18:55:39 UTC 
(rev 14760)
@@ -411,6 +411,10 @@
        int result = 0, nread = 0;
        int total_time = 0, selret;
 
+       if (winbindd_fd == -1) {
+               return -1;
+       }
+
        /* Read data from socket */
        while(nread < count) {
                struct timeval tv;

<Prev in Thread] Current Thread [Next in Thread>
  • svn commit: samba r14760 - in branches/SAMBA_3_0/source/nsswitch: ., jra <=