Attachment 10332 Details for Bug 10861 – proposed patch for 4.2, cherry-picked from master

[patch] proposed patch for 4.2, cherry-picked from master

0001-SO_PROTOCOL-is-platform-dependent.patch (text/plain), 1.39 KB, created by Björn Baumbach on 2014-10-09 08:56:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Baumbach

Created: 2014-10-09 08:56:31 UTC

Size: 1.39 KB

patch

obsolete

>From 99959f9760fe78436ae09bde847fcb326fcdaa27 Mon Sep 17 00:00:00 2001
>From: Jakub Hrozek <jakub.hrozek@gmail.com>
>Date: Thu, 2 Oct 2014 07:04:15 +0200
>Subject: [PATCH] SO_PROTOCOL is platform-dependent
>
>SO_PROTOCOL is not defined on all platforms. In particular, OSX doesn't
>include it and so far I haven't found any compatible declaration.
>
>Signed-off-by: Jakub Hrozek <jakub.hrozek@gmail.com>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit 5e70d80e7d7752a1df16b871d57fbcd8334a44e6)
>---
> lib/socket_wrapper/socket_wrapper.c | 3 +++
> 1 file changed, 3 insertions(+)
>
>diff --git a/lib/socket_wrapper/socket_wrapper.c b/lib/socket_wrapper/socket_wrapper.c
>index afd9343..67303eb 100644
>--- a/lib/socket_wrapper/socket_wrapper.c
>+++ b/lib/socket_wrapper/socket_wrapper.c
>@@ -3169,6 +3169,8 @@ static int swrap_getsockopt(int s, int level, int optname,
> 			*(int *)optval = si->family;
> 			return 0;
> #endif /* SO_DOMAIN */
>+
>+#ifdef SO_PROTOCOL
> 		case SO_PROTOCOL:
> 			if (optval == NULL || optlen == NULL ||
> 			    *optlen < (socklen_t)sizeof(int)) {
>@@ -3179,6 +3181,7 @@ static int swrap_getsockopt(int s, int level, int optname,
> 			*optlen = sizeof(int);
> 			*(int *)optval = si->protocol;
> 			return 0;
>+#endif /* SO_PROTOCOL */
> 		case SO_TYPE:
> 			if (optval == NULL || optlen == NULL ||
> 			    *optlen < (socklen_t)sizeof(int)) {
>-- 
>2.0.4
>

Flags:

asn: review+
metze: review+

Actions: View

Attachments on bug 10861: 10332