Attachment 15814 Details for Bug 14290 – Patch to fix s_addr compilation error on OmniOS

Patch to fix s_addr compilation error on OmniOS

s_addr.patch (text/plain), 1.86 KB, created by Peter Eriksson on 2020-02-21 22:00:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Eriksson

Created: 2020-02-21 22:00:05 UTC

Size: 1.86 KB

patch

obsolete

># OmniOS system header files has a define or s_addr that causes problems. Avoid it
># by using a different name here.
>diff -u -r samba-4.12.0rc1/lib/tsocket/tsocket.h samba-4.12.0rc1-liu/lib/tsocket/tsocket.h
>--- samba-4.12.0rc1/lib/tsocket/tsocket.h	tis jan. 21 15:10:42 2020
>+++ samba-4.12.0rc1-liu/lib/tsocket/tsocket.h	tors jan. 23 22:28:07 2020
>@@ -996,16 +996,16 @@
>  * @return              0 on success, -1 on error with errno set.
>  */
> int tsocket_address_bsd_from_samba_sockaddr(TALLOC_CTX *mem_ctx,
>-					const struct samba_sockaddr *s_addr,
>+					const struct samba_sockaddr *xs_addr,
> 					struct tsocket_address **t_addr);
> #else
> int _tsocket_address_bsd_from_samba_sockaddr(TALLOC_CTX *mem_ctx,
>-					 const struct samba_sockaddr *s_addr,
>+					 const struct samba_sockaddr *xs_addr,
> 					 struct tsocket_address **t_addr,
> 					 const char *location);
> 
>-#define tsocket_address_bsd_from_samba_sockaddr(mem_ctx, s_addr, t_addr) \
>-	_tsocket_address_bsd_from_samba_sockaddr(mem_ctx, s_addr, t_addr, \
>+#define tsocket_address_bsd_from_samba_sockaddr(mem_ctx, xs_addr, t_addr) \
>+	_tsocket_address_bsd_from_samba_sockaddr(mem_ctx, xs_addr, t_addr, \
> 						 __location__)
> #endif
> 
>diff -u -r samba-4.12.0rc1/lib/tsocket/tsocket_bsd.c samba-4.12.0rc1-liu/lib/tsocket/tsocket_bsd.c
>--- samba-4.12.0rc1/lib/tsocket/tsocket_bsd.c	tis jan. 21 15:09:48 2020
>+++ samba-4.12.0rc1-liu/lib/tsocket/tsocket_bsd.c	tors jan. 23 22:28:55 2020
>@@ -282,13 +282,13 @@
> }
> 
> int _tsocket_address_bsd_from_samba_sockaddr(TALLOC_CTX *mem_ctx,
>-					 const struct samba_sockaddr *s_addr,
>+					 const struct samba_sockaddr *xs_addr,
> 					 struct tsocket_address **t_addr,
> 					 const char *location)
> {
> 	return _tsocket_address_bsd_from_sockaddr(mem_ctx,
>-						  &s_addr->u.sa,
>-						  s_addr->sa_socklen,
>+						  &xs_addr->u.sa,
>+						  xs_addr->sa_socklen,
> 						  t_addr,
> 						  location);
> }

Actions: View

Attachments on bug 14290: 15814