summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2021-07-02 09:37:25 +0200
committerKarolin Seeger <kseeger@samba.org>2021-07-12 12:55:43 +0000
commitc1662a8122011aa550b2ae2325de97c6f57e1485 (patch)
tree0035ca266f67aa7490dcb3053c7c4c321672bd3b
parenta6447a1dce1bed1a33ab6aa729f5837acc3895f6 (diff)
downloadsamba-c1662a8122011aa550b2ae2325de97c6f57e1485.tar.gz
gensec_krb5: restore ipv6 support for kpasswd
We need to offer as much space we have in order to get the address out of tsocket_address_bsd_sockaddr(). This fixes a regression in commit 43c808f2ff907497dfff0988ff90a48fdcfc16ef. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14750 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> (cherry picked from commit 0388a8f33bdde49f1cc805a0291859203c1a52b4)
-rw-r--r--source4/auth/gensec/gensec_krb5.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c
index 45abbb97b6b..7d87b3ac6b9 100644
--- a/source4/auth/gensec/gensec_krb5.c
+++ b/source4/auth/gensec/gensec_krb5.c
@@ -149,8 +149,9 @@ static NTSTATUS gensec_krb5_start(struct gensec_security *gensec_security, bool
struct samba_sockaddr addr;
bool ok;
+ addr.sa_socklen = sizeof(addr.u);
sockaddr_ret = tsocket_address_bsd_sockaddr(
- tlocal_addr, &addr.u.sa, sizeof(addr.u.sa));
+ tlocal_addr, &addr.u.sa, addr.sa_socklen);
if (sockaddr_ret < 0) {
talloc_free(gensec_krb5_state);
return NT_STATUS_INTERNAL_ERROR;
@@ -170,8 +171,9 @@ static NTSTATUS gensec_krb5_start(struct gensec_security *gensec_security, bool
struct samba_sockaddr addr;
bool ok;
+ addr.sa_socklen = sizeof(addr.u);
sockaddr_ret = tsocket_address_bsd_sockaddr(
- tremote_addr, &addr.u.sa, sizeof(addr.u.sa));
+ tremote_addr, &addr.u.sa, addr.sa_socklen);
if (sockaddr_ret < 0) {
talloc_free(gensec_krb5_state);
return NT_STATUS_INTERNAL_ERROR;