svn commit: samba r3064 - in branches/SAMBA_4_0/source: include lib ntvfs/posix smb_server

[tridge at samba.org]

Author: tridge
Date: 2004-10-19 12:06:01 +0000 (Tue, 19 Oct 2004)
New Revision: 3064

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=3064&nolog=1

Log:
 - use UINT8_MAX and UINT16_MAX instead of hex values for idr_get_new() limits

 - change idr_get_new() to use > instead of >= in the limit check




Modified:
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/lib/idtree.c
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_search.c
   branches/SAMBA_4_0/source/smb_server/conn.c


Changeset:
Modified: branches/SAMBA_4_0/source/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/include/includes.h	2004-10-19 10:15:34 UTC (rev 3063)
+++ branches/SAMBA_4_0/source/include/includes.h	2004-10-19 12:06:01 UTC (rev 3064)
@@ -466,6 +466,14 @@
 #define uint64 uint64_t
 #endif
 
+#ifndef UINT8_MAX
+#define UINT8_MAX 255
+#endif
+
+#ifndef UINT16_MAX
+#define UINT16_MAX 65535
+#endif
+
 /*
  * Types for devices, inodes and offsets.
  */

Modified: branches/SAMBA_4_0/source/lib/idtree.c
===================================================================
--- branches/SAMBA_4_0/source/lib/idtree.c	2004-10-19 10:15:34 UTC (rev 3063)
+++ branches/SAMBA_4_0/source/lib/idtree.c	2004-10-19 12:06:01 UTC (rev 3064)
@@ -322,7 +322,7 @@
 int idr_get_new(void *idp, void *ptr, int limit)
 {
 	int ret = idr_get_new_above_int((struct idr *)idp, ptr, 0);
-	if (ret >= limit) {
+	if (ret > limit) {
 		idr_remove(idp, ret);
 		return -1;
 	}
@@ -336,7 +336,7 @@
 int idr_get_new_above(void *idp, void *ptr, int starting_id, int limit)
 {
 	int ret = idr_get_new_above_int((struct idr *)idp, ptr, starting_id);
-	if (ret >= limit) {
+	if (ret > limit) {
 		idr_remove(idp, ret);
 		return -1;
 	}

Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c	2004-10-19 10:15:34 UTC (rev 3063)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c	2004-10-19 12:06:01 UTC (rev 3064)
@@ -157,7 +157,7 @@
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	fnum = idr_get_new(pvfs->idtree_fnum, f, 0x10000);
+	fnum = idr_get_new(pvfs->idtree_fnum, f, UINT16_MAX);
 	if (fnum == -1) {
 		talloc_free(f);
 		return NT_STATUS_TOO_MANY_OPENED_FILES;

Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_search.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_search.c	2004-10-19 10:15:34 UTC (rev 3063)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_search.c	2004-10-19 12:06:01 UTC (rev 3064)
@@ -287,7 +287,7 @@
 
 	/* we need to give a handle back to the client so it
 	   can continue a search */
-	id = idr_get_new(pvfs->idtree_search, search, 0x100);
+	id = idr_get_new(pvfs->idtree_search, search, UINT8_MAX);
 	if (id == -1) {
 		return NT_STATUS_INSUFFICIENT_RESOURCES;
 	}
@@ -415,7 +415,7 @@
 		return status;
 	}
 
-	id = idr_get_new(pvfs->idtree_search, search, 0x10000);
+	id = idr_get_new(pvfs->idtree_search, search, UINT16_MAX);
 	if (id == -1) {
 		return NT_STATUS_INSUFFICIENT_RESOURCES;
 	}

Modified: branches/SAMBA_4_0/source/smb_server/conn.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/conn.c	2004-10-19 10:15:34 UTC (rev 3063)
+++ branches/SAMBA_4_0/source/smb_server/conn.c	2004-10-19 12:06:01 UTC (rev 3064)
@@ -59,7 +59,7 @@
 	tcon = talloc_zero_p(smb_conn, struct smbsrv_tcon);
 	if (!tcon) return NULL;
 
-	i = idr_get_new(smb_conn->tree.idtree_tid, tcon, UINT16_MAX + 1);
+	i = idr_get_new(smb_conn->tree.idtree_tid, tcon, UINT16_MAX);
 	if (i == -1) {
 		DEBUG(1,("ERROR! Out of connection structures\n"));	       
 		return NULL;