From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 2 Feb 2024 16:50:03 +0000 (+0100)
Subject: s3:libads: use the correct struct sockbuf_io_desc type for 'sbiod' pointer
X-Git-Tag: tdb-1.4.11~949
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86e03bd515e08250bbb0d22631d48b2143bd43ec;p=thirdparty%2Fsamba.git

s3:libads: use the correct struct sockbuf_io_desc type for 'sbiod' pointer

Using 'Sockbuf_IO_Desc' in idl implicitly means pidl will use
'struct Sockbuf_IO_Desc', which doesn't exist!

Using 'struct sockbuf_io_desc' which is used in OpenLDAP to
typedef Sockbuf_IO_Desc, we won't need to cast the assign the
'sbiod' pointer.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source3/libads/sasl_wrapping.c b/source3/libads/sasl_wrapping.c
index 7a58765007c..7f079478948 100644
--- a/source3/libads/sasl_wrapping.c
+++ b/source3/libads/sasl_wrapping.c
@@ -58,7 +58,7 @@ static int ads_saslwrap_setup(Sockbuf_IO_Desc *sbiod, void *arg)
 {
 	struct ads_saslwrap *wrap = (struct ads_saslwrap *)arg;
 
-	wrap->sbiod	= (struct Sockbuf_IO_Desc *)sbiod;
+	wrap->sbiod = sbiod;
 
 	sbiod->sbiod_pvt = wrap;
 
diff --git a/source3/librpc/idl/ads.idl b/source3/librpc/idl/ads.idl
index c42e6784ed2..b7658ca19ea 100644
--- a/source3/librpc/idl/ads.idl
+++ b/source3/librpc/idl/ads.idl
@@ -93,7 +93,7 @@ interface ads
 		ads_saslwrap_type wrap_type;
 		[ignore] ads_saslwrap_ops *wrap_ops;
 #ifdef HAVE_LDAP_SASL_WRAPPING
-		[ignore] Sockbuf_IO_Desc *sbiod; /* lowlevel state for LDAP wrapping */
+		[ignore] struct sockbuf_io_desc *sbiod; /* lowlevel state for LDAP wrapping */
 #endif /* HAVE_LDAP_SASL_WRAPPING */
 		[ignore] TALLOC_CTX *mem_ctx;
 		[ignore] void *wrap_private_data;