diff options
| author | Jeremy Allison <jra@samba.org> | 1998-07-22 13:59:19 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-07-22 13:59:19 +0000 |
| commit | f5866fd4ba8da9acde87c7f9da8f1a242540e287 (patch) | |
| tree | c7e80a6b7321319b683e4d730b0de7e6f5ed2ff9 /source3/include | |
| parent | 781c9e50820e3bc2b11e15bbff2f16b6ad74f26a (diff) | |
| download | samba-f5866fd4ba8da9acde87c7f9da8f1a242540e287.tar.gz samba-f5866fd4ba8da9acde87c7f9da8f1a242540e287.tar.bz2 samba-f5866fd4ba8da9acde87c7f9da8f1a242540e287.zip | |
Fixed bug found by Richard Sharpe. After increasing files_struct size by
MAX_OPEN_DIRECTORIES for nttrans I forgot to update the code that
enumerates the array.
Created new MAX_FNUMS in local.h, changed all code that iterates
through the files_struct array to use this.
(sorry Richard).
Jeremy.
(This used to be commit 339b10222269d71c7a493cc08b7b1bfd35fd55fc)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/local.h | 2 | ||||
| -rw-r--r-- | source3/include/smb.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source3/include/local.h b/source3/include/local.h index 4a69325b77..a55af443ec 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -42,6 +42,8 @@ file handle per directory, but large numbers do use more memory */ #define MAX_OPEN_DIRECTORIES 64 +#define MAX_FNUMS (MAX_OPEN_FILES+MAX_OPEN_DIRECTORIES) + /* Default size of shared memory used for share mode locking */ #ifndef SHMEM_SIZE #define SHMEM_SIZE (1024*(MAX_OPEN_FILES+MAX_OPEN_DIRECTORIES)) diff --git a/source3/include/smb.h b/source3/include/smb.h index 921cb4284d..7079198a40 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -781,7 +781,7 @@ struct parm_struct #endif /* LOCKING_VERSION */ /* these are useful macros for checking validity of handles */ -#define VALID_FNUM(fnum) (((fnum) >= 0) && ((fnum) < MAX_OPEN_FILES)) +#define VALID_FNUM(fnum) (((fnum) >= 0) && ((fnum) < MAX_FNUMS)) #define OPEN_FNUM(fnum) (VALID_FNUM(fnum) && Files[fnum].open && !Files[fnum].is_directory) #define VALID_CNUM(cnum) (((cnum) >= 0) && ((cnum) < MAX_CONNECTIONS)) #define OPEN_CNUM(cnum) (VALID_CNUM(cnum) && Connections[cnum].open) |