Attachment 1200 Details for Bug 2622 – Proposed patch

[patch] Proposed patch

look (text/plain), 1.97 KB, created by Jeremy Allison on 2005-05-01 02:25:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2005-05-01 02:25:33 UTC

Size: 1.97 KB

patch

obsolete

>--- /home/jeremy/tmp/samba-3.0.14a/source/include/smb_macros.h	2005-04-13 23:14:26.000000000 -0700
>+++ ./include/smb_macros.h	2005-05-01 02:21:08.000000000 -0700
>@@ -225,16 +225,10 @@
> 	split_at_last_component(full_keyname, key_name, '\\', subkey_name)
> 
> /****************************************************************************
>- Used by dptr_zero.
>-****************************************************************************/
>-
>-#define DPTR_MASK ((uint32)(((uint32)1)<<31))
>-
>-/****************************************************************************
>  Return True if the offset is at zero.
> ****************************************************************************/
> 
>-#define dptr_zero(buf) ((IVAL(buf,1)&~DPTR_MASK) == 0)
>+#define dptr_zero(buf) (IVAL(buf,1) == 0)
> 
> /*******************************************************************
> copy an IP address from one buffer to another
>--- /home/jeremy/tmp/samba-3.0.14a/source/smbd/dir.c	2005-04-13 23:14:20.000000000 -0700
>+++ ./smbd/dir.c	2005-05-01 02:21:08.000000000 -0700
>@@ -622,11 +622,11 @@
> 		DEBUG(1,("filling null dirptr %d\n",key));
> 		return(False);
> 	}
>-	offset = TellDir(dptr->dir_hnd);
>+	offset = (uint32)TellDir(dptr->dir_hnd);
> 	DEBUG(6,("fill on key %u dirptr 0x%lx now at %d\n",key,
> 		(long)dptr->dir_hnd,(int)offset));
> 	buf[0] = key;
>-	SIVAL(buf,1,offset | DPTR_MASK);
>+	SIVAL(buf,1,offset);
> 	return(True);
> }
> 
>@@ -639,16 +639,22 @@
> 	unsigned int key = *(unsigned char *)buf;
> 	struct dptr_struct *dptr = dptr_get(key, False);
> 	uint32 offset;
>+	long seekoff;
> 
> 	if (!dptr) {
> 		DEBUG(3,("fetched null dirptr %d\n",key));
> 		return(NULL);
> 	}
> 	*num = key;
>-	offset = IVAL(buf,1)&~DPTR_MASK;
>-	SeekDir(dptr->dir_hnd,(long)offset);
>+	offset = IVAL(buf,1);
>+	if (offset == (uint32)-1) {
>+		seekoff = -1;
>+	} else {
>+		seekoff = (long)offset;
>+	}
>+	SeekDir(dptr->dir_hnd,seekoff);
> 	DEBUG(3,("fetching dirptr %d for path %s at offset %d\n",
>-		key,dptr_path(key),offset));
>+		key,dptr_path(key),(int)seekoff));
> 	return(dptr);
> }

Actions: View

Attachments on bug 2622: 1178 | 1179 | 1197 | 1200