From: Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
Date: Wed, 8 Sep 2021 11:52:57 +0000 (+0100)
Subject: charset_macosxfs.c: fix compilation on macOS
X-Git-Tag: ldb-2.5.0~484
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2564e96e8319b4cb4c987dd2a03cf8a293db985a;p=thirdparty%2Fsamba.git

charset_macosxfs.c: fix compilation on macOS

The DEBUG macro was missing and the CFStringGetBytes() was triggering a
-Werror,-Wpointer-sign build failure.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14862

Signed-off-by: Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/lib/util/charset/charset_macosxfs.c b/lib/util/charset/charset_macosxfs.c
index 55a6df85fb7..75dbb4bad87 100644
--- a/lib/util/charset/charset_macosxfs.c
+++ b/lib/util/charset/charset_macosxfs.c
@@ -32,6 +32,7 @@
 #include "replace.h"
 #include "charset.h"
 #include "charset_proto.h"
+#include "lib/util/debug.h"
 #undef realloc
 
 #ifdef DARWINOS
@@ -378,7 +379,7 @@ size_t macosxfs_encoding_push(
 	charsconverted = CFStringGetBytes(
 		cfstring, CFRangeMake(0,cfsize),
 		script_code, 0, false,
-		*outbuf, *outbytesleft, &outsize);
+		*(UInt8 **)outbuf, *outbytesleft, &outsize);
 
 	if (0 == charsconverted) {
 		debug_out("String conversion: "