s3: Remove unsused MMAP_BLACKLIST ifdef checks

This doesn't get defined by anything.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>

diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index a6cafc10d66b149c003762190948320e3efc4a31..ece71b741071d63346e30f684efb95c024868914 100644 (file)
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -832,10 +832,6 @@ typedef unsigned long long ptrdiff_t ;
  */
 #define PTR_DIFF(p1,p2) ((ptrdiff_t)(((const char *)(p1)) - (const char *)(p2)))
 
-#if MMAP_BLACKLIST
-#undef HAVE_MMAP
-#endif
-
 #ifdef __COMPAR_FN_T
 #define QSORT_CAST (__compar_fn_t)
 #endif

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 9c47c342bba047edfcd8d60f0c89951460584532..032776003a3d6b3240aca3f9d494a932b88ae67f 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -362,13 +362,6 @@ char *talloc_asprintf_strupper_m(TALLOC_CTX *t, const char *fmt, ...) PRINTF_ATT
 #endif
 #define FALSE __ERROR__XX__DONT_USE_FALSE
 
-/* If we have blacklisted mmap() try to avoid using it accidentally by
-   undefining the HAVE_MMAP symbol. */
-
-#ifdef MMAP_BLACKLIST
-#undef HAVE_MMAP
-#endif
-
 void dump_core(void) _NORETURN_;
 void exit_server(const char *const reason) _NORETURN_;
 void exit_server_cleanly(const char *const reason) _NORETURN_;

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 994f9b0ce4314cd89ae2ae6e3486f079e968e15b..d8be520dc518aefc4ed6746ee5370fa27a11fa3c 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -712,11 +712,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
        Globals.oplock_break_wait_time = 0;     /* By Default, 0 msecs. */
        Globals.enhanced_browsing = true;
        Globals.lock_spin_time = WINDOWS_MINIMUM_LOCK_TIMEOUT_MS; /* msec. */
-#ifdef MMAP_BLACKLIST
-       Globals.use_mmap = false;
-#else
        Globals.use_mmap = true;
-#endif
        Globals.unicode = true;
        Globals.unix_extensions = true;
        Globals.reset_on_zero_vc = false;