svn commit: samba r23143 - in branches/SAMBA_4_0/source/torture/raw: .

tridge at samba.org tridge at samba.org
Fri May 25 12:35:05 GMT 2007


Author: tridge
Date: 2007-05-25 12:35:03 +0000 (Fri, 25 May 2007)
New Revision: 23143

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

Log:
error found by valgrind

Modified:
   branches/SAMBA_4_0/source/torture/raw/lockbench.c
   branches/SAMBA_4_0/source/torture/raw/openbench.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/raw/lockbench.c
===================================================================
--- branches/SAMBA_4_0/source/torture/raw/lockbench.c	2007-05-25 12:21:29 UTC (rev 23142)
+++ branches/SAMBA_4_0/source/torture/raw/lockbench.c	2007-05-25 12:35:03 UTC (rev 23143)
@@ -274,15 +274,16 @@
 	fflush(stdout);
 	event_add_timed(ev, state, timeval_current_ofs(1, 0), report_rate, state);
 
-	if (!state[i].tree) {
-		return;
-	}
-
 	/* send an echo on each interface to ensure it stays alive - this helps
 	   with IP takeover */
 	for (i=0;i<nprocs;i++) {
 		struct smb_echo p;
 		struct smbcli_request *req;
+
+		if (!state[i].tree) {
+			continue;
+		}
+
 		p.in.repeat_count = 1;
 		p.in.size = 0;
 		p.in.data = NULL;

Modified: branches/SAMBA_4_0/source/torture/raw/openbench.c
===================================================================
--- branches/SAMBA_4_0/source/torture/raw/openbench.c	2007-05-25 12:21:29 UTC (rev 23142)
+++ branches/SAMBA_4_0/source/torture/raw/openbench.c	2007-05-25 12:35:03 UTC (rev 23143)
@@ -314,15 +314,16 @@
 	fflush(stdout);
 	event_add_timed(ev, state, timeval_current_ofs(1, 0), report_rate, state);
 
-	if (!state[i].tree) {
-		return;
-	}
-
 	/* send an echo on each interface to ensure it stays alive - this helps
 	   with IP takeover */
 	for (i=0;i<nprocs;i++) {
 		struct smb_echo p;
 		struct smbcli_request *req;
+
+		if (!state[i].tree) {
+			continue;
+		}
+
 		p.in.repeat_count = 1;
 		p.in.size = 0;
 		p.in.data = NULL;



More information about the samba-cvs mailing list