3 files changed, 8 insertions, 2 deletions
diff --git a/source4/include/context.h b/source4/include/context.h
index 5c7d117050..17664c50f8 100644
--- a/source4/include/context.h
+++ b/source4/include/context.h
@@ -278,6 +278,9 @@ struct negotiate_context {
 
 	/* client capabilities */
 	uint32 client_caps;
+
+	/* the timezone we sent to the client */
+	int zone_offset;
 };
 	
 /* this is the context for a SMB socket associated with the socket itself */
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 79fca5f7b4..b611974e29 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -680,6 +680,7 @@ extern int errno;
 #include "xfile.h"
 #include "dlinklist.h"
 #include "lib/ldb/include/ldb.h"
+#include "lib/ldb/include/ldb_parse.h"
 #include "lib/tdb/tdb.h"
 #include "lib/tdb/spinlock.h"
 #include "lib/tdb/tdbutil.h"
@@ -749,8 +750,6 @@ struct functable {
 typedef int (*comparison_fn_t)(const void *, const void *);
 #endif
 
-#include "lib/ldb/include/ldb_parse.h"
-
 #include "nsswitch/nss.h"
 
 /***** automatically generated prototypes *****/
diff --git a/source4/include/talloc.h b/source4/include/talloc.h
index 60a2822f38..204dd406b9 100644
--- a/source4/include/talloc.h
+++ b/source4/include/talloc.h
@@ -51,6 +51,10 @@ char *talloc_asprintf_append(TALLOC_CTX *t, char *, const char *, ...)
 #define talloc_array_p(ctx, type, count) (type *)talloc_realloc_array(ctx, NULL, sizeof(type), count)
 #define talloc_realloc_p(ctx, p, type, count) (type *)talloc_realloc_array(ctx, p, sizeof(type), count)
 
+#define malloc_p(type) (type *)malloc(sizeof(type))
+#define malloc_array_p(type, count) (type *)realloc_array(NULL, sizeof(type), count)
+#define realloc_p(p, type, count) (type *)realloc_array(p, sizeof(type), count)
+
 /** @} */
 
 #endif /* ndef _TALLOC_H_ */