svn commit: samba r22923 - in branches: SAMBA_3_0/source/lib SAMBA_3_0_26/source/lib

jra at samba.org jra at samba.org
Wed May 16 01:13:27 GMT 2007


Author: jra
Date: 2007-05-16 01:13:25 +0000 (Wed, 16 May 2007)
New Revision: 22923

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

Log:
Fix runaway smbd now receive_smb_raw() returns a ssize_t not a BOOL.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/lib/util_sock.c
   branches/SAMBA_3_0_26/source/lib/util_sock.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/util_sock.c
===================================================================
--- branches/SAMBA_3_0/source/lib/util_sock.c	2007-05-16 00:21:12 UTC (rev 22922)
+++ branches/SAMBA_3_0/source/lib/util_sock.c	2007-05-16 01:13:25 UTC (rev 22923)
@@ -738,7 +738,7 @@
 
 BOOL receive_smb(int fd, char *buffer, unsigned int timeout)
 {
-	if (!receive_smb_raw(fd, buffer, timeout, 0)) {
+	if (receive_smb_raw(fd, buffer, timeout, 0) <= 0) {
 		return False;
 	}
 

Modified: branches/SAMBA_3_0_26/source/lib/util_sock.c
===================================================================
--- branches/SAMBA_3_0_26/source/lib/util_sock.c	2007-05-16 00:21:12 UTC (rev 22922)
+++ branches/SAMBA_3_0_26/source/lib/util_sock.c	2007-05-16 01:13:25 UTC (rev 22923)
@@ -738,7 +738,7 @@
 
 BOOL receive_smb(int fd, char *buffer, unsigned int timeout)
 {
-	if (!receive_smb_raw(fd, buffer, timeout, 0)) {
+	if (receive_smb_raw(fd, buffer, timeout, 0) <= 0) {
 		return False;
 	}
 



More information about the samba-cvs mailing list