summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-10-21 04:46:23 +0000
committerTim Potter <tpot@samba.org>2003-10-21 04:46:23 +0000
commit87a6e23fcc9bffdb9947aa4d9ff8469eabdadb30 (patch)
tree5b1c342b47ceb13561849f5ba45baaa2d470fb66
parent8838f54497d5cab4f1120cfc87f611b3e7e42698 (diff)
downloadsamba-87a6e23fcc9bffdb9947aa4d9ff8469eabdadb30.tar.gz
samba-87a6e23fcc9bffdb9947aa4d9ff8469eabdadb30.tar.bz2
samba-87a6e23fcc9bffdb9947aa4d9ff8469eabdadb30.zip
Merge of mmap blacklist fix from HEAD.
(This used to be commit ff29be16e74361b02b0b7fbd83e393d68ae5b897)
-rw-r--r--source3/include/includes.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 452b489547..fba2eabbe1 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1319,4 +1319,11 @@ BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_conte
#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
+
#endif /* _INCLUDES_H */