some cleanups from the conversion of Pipes[] to a linked list. I also

removed most cases where a pnum is used and substituted a pipes_struct*.

in files.c I added a offset of 0x1000 to all file handles on the
wire. This makes it much less likely that bad parsing will give us the
wrong field.

1 files changed, 13 insertions, 3 deletions

diff --git a/source/lib/bitmap.c b/source/lib/bitmap.c
index ab84a2a84ec..ce677f78461 100644
--- a/source/lib/bitmap.c
+++ b/source/lib/bitmap.c
@@ -21,6 +21,8 @@
 
 #include "includes.h"
 
+extern int DEBUGLEVEL;
+
 /* these functions provide a simple way to allocate integers from a
    pool without repitition */
 
@@ -64,7 +66,11 @@ set a bit in a bitmap
 ****************************************************************************/
 BOOL bitmap_set(struct bitmap *bm, unsigned i)
 {
-	if (i >= bm->n) return False;
+	if (i >= bm->n) {
+		DEBUG(0,("Setting invalid bitmap entry %d (of %d)\n",
+		      i, bm->n));
+		return False;
+	}
 	bm->b[i/32] |= (1<<(i%32));
 	return True;
 }
@@ -74,7 +80,11 @@ clear a bit in a bitmap
 ****************************************************************************/
 BOOL bitmap_clear(struct bitmap *bm, unsigned i)
 {
-	if (i >= bm->n) return False;
+	if (i >= bm->n) {
+		DEBUG(0,("clearing invalid bitmap entry %d (of %d)\n",
+		      i, bm->n));
+		return False;
+	}
 	bm->b[i/32] &= ~(1<<(i%32));
 	return True;
 }
@@ -82,7 +92,7 @@ BOOL bitmap_clear(struct bitmap *bm, unsigned i)
 /****************************************************************************
 query a bit in a bitmap
 ****************************************************************************/
-BOOL bitmap_query(struct bitmap *bm, unsigned i)
+static BOOL bitmap_query(struct bitmap *bm, unsigned i)
 {
 	if (i >= bm->n) return False;
 	if (bm->b[i/32] & (1<<(i%32))) {