This split the mangling code up to allow for the possibility of multiple

mangling implementation, selectable using "mangling method = " in smb.conf

It also tidies the interface a little, although it is still nasty.
(This used to be commit be23d87a178e7d0691e7d942adf89bb3d2d533c2)

3 files changed, 19 insertions, 0 deletions

diff --git a/source3/include/includes.h b/source3/include/includes.h
index e19961b575..5da1c1d997 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -746,6 +746,8 @@ extern int errno;
 
 #include "popt.h"
 
+#include "mangle.h"
+
 #ifndef MAXCODEPAGELINES
 #define MAXCODEPAGELINES 256
 #endif
diff --git a/source3/include/local.h b/source3/include/local.h
index c7abe207c8..1ecd63738e 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -197,4 +197,10 @@
 /* Allocation roundup. */
 #define SMB_ROUNDUP_ALLOCATION_SIZE 0x100000
 
+/* shall we deny oplocks to clients that get timeouts? */
+#define FASCIST_OPLOCK_BACKOFF 1
+
+/* this enables the "rabbit pellet" fix for SMBwritebraw */
+#define RABBIT_PELLET_FIX 1
+
 #endif
diff --git a/source3/include/mangle.h b/source3/include/mangle.h
new file mode 100644
index 0000000000..d3218519f8
--- /dev/null
+++ b/source3/include/mangle.h
@@ -0,0 +1,11 @@
+/*
+  header for 8.3 name mangling interface 
+*/
+
+struct mangle_fns {
+	BOOL (*is_mangled)(const char *s);
+	BOOL (*is_8_3)(const char *fname, BOOL check_case);
+	void (*reset)(void);
+	BOOL (*check_cache)(char *s);
+	BOOL (*name_map)(char *OutName, BOOL need83, BOOL cache83);
+};