From: Jeremy Allison <jra@samba.org> 
Date: Mon, 20 Aug 2001 22:13:53 +0000 (+0000)
Subject: Ensure we are very explicit about what we're comparing when
X-Git-Tag: samba-2.2.5pre1~1555^2~127
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41066208ad8ca20d35a32bdf9ad934e11465c8f1;p=thirdparty%2Fsamba.git

Ensure we are very explicit about what we're comparing when
we're comparing structures (ie. don't just do a memcmp). I
don't think this will fix the fcntl spin issue, but it's a
"just in case" change.
Jeremy.
---

diff --git a/source/locking/locking.c b/source/locking/locking.c
index 9b393ed6bac..ee3ce7c7d41 100644
--- a/source/locking/locking.c
+++ b/source/locking/locking.c
@@ -448,8 +448,8 @@ size_t del_share_mode(files_struct *fsp, share_mode_entry **ppse)
 	   from the record */
 	for (i=0;i<data->num_share_mode_entries;) {
 		if (shares[i].pid == pid &&
-		    memcmp(&shares[i].time, 
-			   &fsp->open_time,sizeof(struct timeval)) == 0) {
+		    shares[i].time.tv_sec == fsp->open_time.tv_sec &&
+		    shares[i].time.tv_usec == fsp->open_time.tv_usec ) {
 			*ppse = memdup(&shares[i], sizeof(*shares));
 			data->num_share_mode_entries--;
 			memmove(&shares[i], &shares[i+1], 
@@ -566,8 +566,8 @@ static BOOL mod_share_mode(files_struct *fsp,
 	for (i=0;i<data->num_share_mode_entries;i++) {
 		if (pid == shares[i].pid && 
 		    shares[i].share_mode == fsp->share_mode &&
-		    memcmp(&shares[i].time, 
-			   &fsp->open_time,sizeof(struct timeval)) == 0) {
+		    shares[i].time.tv_sec == fsp->open_time.tv_sec &&
+		    shares[i].time.tv_usec == fsp->open_time.tv_usec ) {
 			mod_fn(&shares[i], fsp->dev, fsp->inode, param);
 			need_store=1;
 		}