diff options
author | Stefan Metzmacher <metze@samba.org> | 2017-10-09 12:50:35 +0200 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2017-10-25 08:43:05 +0200 |
commit | 64db83bfb1738c0bdbc4d32579ec7c54ff083667 (patch) | |
tree | cd961e3e506dd67c9705edb91eefa41ed3d4b907 | |
parent | 779a5a9894ed631f1872dd97e34537c892e6a352 (diff) | |
download | samba-64db83bfb1738c0bdbc4d32579ec7c54ff083667.tar.gz |
krb5_wrap: KRB5_ADDRESS_INET6 is not a define in Heimdal
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)
-rw-r--r-- | lib/krb5_wrap/krb5_samba.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |