]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
krb5_wrap: KRB5_ADDRESS_INET6 is not a define in Heimdal
authorStefan Metzmacher <metze@samba.org>
Mon, 9 Oct 2017 10:50:35 +0000 (12:50 +0200)
committerKarolin Seeger <kseeger@samba.org>
Wed, 25 Oct 2017 06:43:03 +0000 (08:43 +0200)
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

index 6a863bdbb3b7ad600a32f0aeebd6d4390992c678..fb0a436989118a0e58e96eafdf33de237a83e639 100644 (file)
@@ -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);