r6613: Merge back fix for PARANOID_MALLOC checker.

Jeremy.

diff --git a/source/include/smb_macros.h b/source/include/smb_macros.h
index 53c4ad046d501e2d5a17ca1d7ddc91706b291eae..7e90f01b5f9dacdcc7153e287b9be5149561673a 100644 (file)
--- a/source/include/smb_macros.h
+++ b/source/include/smb_macros.h
@@ -289,7 +289,9 @@ copy an IP address from one buffer to another
 #define TALLOC_REALLOC_ARRAY(ctx, ptr, type, count) (type *)_talloc_realloc_array(ctx, ptr, sizeof(type), count, #type)
 #define talloc_destroy(ctx) talloc_free(ctx)
 
-#define PARANOID_MALLOC_CHECKER 1
+#if defined(DEVELOPER) && !defined(SMBMOUNT_MALLOC)
+#  define PARANOID_MALLOC_CHECKER 1
+#endif
 
 #if defined(PARANOID_MALLOC_CHECKER)