diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-08 12:27:52 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-08 12:27:52 +0100 |
| commit | 3318204d294f3b3ac3409f192edc3eddeada245b (patch) | |
| tree | 442f52cc0c9bae0378c228c85166bcd005e60336 /source3/smbd/dir.c | |
| parent | ba5d6e6d706ebf07640ee24d701255cbb4803525 (diff) | |
| parent | 3dde0cbb769b92d922be13677ad076cae9b6a693 (diff) | |
| download | samba-3318204d294f3b3ac3409f192edc3eddeada245b.tar.gz samba-3318204d294f3b3ac3409f192edc3eddeada245b.tar.bz2 samba-3318204d294f3b3ac3409f192edc3eddeada245b.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/smbd/dir.c')
| -rw-r--r-- | source3/smbd/dir.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index c2735c032a..2b996a41cf 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -19,6 +19,7 @@ */ #include "includes.h" +#include "smbd/globals.h" /* This module implements directory related functions for Samba. @@ -61,9 +62,6 @@ struct dptr_struct { bool did_stat; /* Optimisation for non-wcard searches. */ }; -static struct bitmap *dptr_bmap; -static struct dptr_struct *dirptrs; -static int dirhandles_open = 0; #define INVALID_DPTR_KEY (-3) @@ -119,17 +117,13 @@ bool make_dir_struct(TALLOC_CTX *ctx, void init_dptrs(void) { - static bool dptrs_init=False; - - if (dptrs_init) + if (dptr_bmap) return; dptr_bmap = bitmap_allocate(MAX_DIRECTORY_HANDLES); if (!dptr_bmap) exit_server("out of memory in init_dptrs"); - - dptrs_init = True; } /**************************************************************************** |