Attachment 13682 Details for Bug 13079 – git-am fix for 4.7.next, 4.6.next.

[patch] git-am fix for 4.7.next, 4.6.next.

bug-13079 (text/plain), 2.50 KB, created by Jeremy Allison on 2017-10-13 00:11:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2017-10-13 00:11:01 UTC

Size: 2.50 KB

patch

obsolete

>From ed8d2749e5b6401271d1a997c1284b1749b1e2ad Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Mon, 9 Oct 2017 12:50:35 +0200
>Subject: [PATCH 1/2] krb5_wrap: KRB5_ADDRESS_INET6 is not a define in Heimdal
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>All supported versions of Heimal already have KRB5_ADDRESS_INET6,
>so there's no need for an explicit check.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13079
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: BjÃ¶rn Jacke <bjacke@samba.org>
>(cherry picked from commit 70146841272bc87c335bd24b736ba2c62efdfe06)
>---
> lib/krb5_wrap/krb5_samba.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
>index fcde9f5de81..d00b7328332 100644
>--- a/lib/krb5_wrap/krb5_samba.c
>+++ b/lib/krb5_wrap/krb5_samba.c
>@@ -150,7 +150,7 @@ bool smb_krb5_sockaddr_to_kaddr(struct sockaddr_storage *paddr,
> 				krb5_address *pkaddr)
> {
> 	memset(pkaddr, '\0', sizeof(krb5_address));
>-#if defined(HAVE_IPV6) && defined(KRB5_ADDRESS_INET6)
>+#ifdef HAVE_IPV6
> 	if (paddr->ss_family == AF_INET6) {
> 		pkaddr->addr_type = KRB5_ADDRESS_INET6;
> 		pkaddr->address.length = sizeof(((struct sockaddr_in6 *)paddr)->sin6_addr);
>-- 
>2.15.0.rc0.271.g36b669edcc-goog
>
>
>From fd129e898254e58a5377dd00618d609e04fae78d Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Mon, 9 Oct 2017 12:50:35 +0200
>Subject: [PATCH 2/2] krb5_wrap: ADDRTYPE_INET6 is available in all supported
> MIT versions
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13079
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: BjÃ¶rn Jacke <bjacke@samba.org>
>(cherry picked from commit 96e471eecce91e6cd9b92d854a3c6ca10e0634f3)
>---
> lib/krb5_wrap/krb5_samba.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
>index d00b7328332..7c461e5c286 100644
>--- a/lib/krb5_wrap/krb5_samba.c
>+++ b/lib/krb5_wrap/krb5_samba.c
>@@ -183,7 +183,7 @@ bool smb_krb5_sockaddr_to_kaddr(struct sockaddr_storage *paddr,
> 				krb5_address *pkaddr)
> {
> 	memset(pkaddr, '\0', sizeof(krb5_address));
>-#if defined(HAVE_IPV6) && defined(ADDRTYPE_INET6)
>+#ifdef HAVE_IPV6
> 	if (paddr->ss_family == AF_INET6) {
> 		pkaddr->addrtype = ADDRTYPE_INET6;
> 		pkaddr->length = sizeof(((struct sockaddr_in6 *)paddr)->sin6_addr);
>-- 
>2.15.0.rc0.271.g36b669edcc-goog
>

Flags:

jra: review? (metze)
bjacke: review+

Actions: View

Attachments on bug 13079: 13673 | 13678 | 13682