From 81917a1162b168b2cd7a07706262cff3d9624e6a Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 25 Aug 2016 16:59:18 +0200 Subject: [PATCH] krb5_wrap: Rename setup_kaddr() Use a better and consistent name and switch the arguments to reflect the name. Signed-off-by: Andreas Schneider Reviewed-by: Andrew Bartlett --- lib/krb5_wrap/krb5_samba.c | 28 ++++++++++++++++++++++++++-- lib/krb5_wrap/krb5_samba.h | 3 ++- source4/auth/gensec/gensec_krb5.c | 8 ++++---- 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c index 2943b33b25f..7997fe5f743 100644 --- a/lib/krb5_wrap/krb5_samba.c +++ b/lib/krb5_wrap/krb5_samba.c @@ -94,7 +94,19 @@ krb5_error_code krb5_auth_con_set_req_cksumtype( #if defined(HAVE_ADDR_TYPE_IN_KRB5_ADDRESS) /* HEIMDAL */ - bool setup_kaddr( krb5_address *pkaddr, struct sockaddr_storage *paddr) + +/** + * @brief Stores the address of a 'struct sockaddr_storage' a krb5_address + * + * @param[in] paddr A pointer to a 'struct sockaddr_storage to extract the + * address from. + * + * @param[out] pkaddr A Kerberos address to store tha address in. + * + * @return True on success, false if an error occured. + */ +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) @@ -115,7 +127,19 @@ krb5_error_code krb5_auth_con_set_req_cksumtype( } #elif defined(HAVE_ADDRTYPE_IN_KRB5_ADDRESS) /* MIT */ -bool setup_kaddr( krb5_address *pkaddr, struct sockaddr_storage *paddr) + +/** + * @brief Stores the address of a 'struct sockaddr_storage' a krb5_address + * + * @param[in] paddr A pointer to a 'struct sockaddr_storage to extract the + * address from. + * + * @param[in] pkaddr A Kerberos address to store tha address in. + * + * @return True on success, false if an error occured. + */ +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) diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h index 2d3161934a1..db70bb8cd6d 100644 --- a/lib/krb5_wrap/krb5_samba.h +++ b/lib/krb5_wrap/krb5_samba.h @@ -162,7 +162,8 @@ void krb5_free_unparsed_name(krb5_context ctx, char *val); #endif /* Samba wrapper functions for krb5 functionality. */ -bool setup_kaddr( krb5_address *pkaddr, struct sockaddr_storage *paddr); +bool smb_krb5_sockaddr_to_kaddr(struct sockaddr_storage *paddr, + krb5_address *pkaddr); krb5_error_code smb_krb5_mk_error(krb5_context context, krb5_error_code error_code, diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c index 8dbec156745..fb3e4656470 100644 --- a/source4/auth/gensec/gensec_krb5.c +++ b/source4/auth/gensec/gensec_krb5.c @@ -159,9 +159,9 @@ static NTSTATUS gensec_krb5_start(struct gensec_security *gensec_security, bool talloc_free(gensec_krb5_state); return NT_STATUS_INTERNAL_ERROR; } - ok = setup_kaddr(&my_krb5_addr, &ss); + ok = smb_krb5_sockaddr_to_kaddr(&ss, &my_krb5_addr); if (!ok) { - DBG_WARNING("setup_kaddr (local) failed\n"); + DBG_WARNING("smb_krb5_sockaddr_to_kaddr (local) failed\n"); talloc_free(gensec_krb5_state); return NT_STATUS_INTERNAL_ERROR; } @@ -180,9 +180,9 @@ static NTSTATUS gensec_krb5_start(struct gensec_security *gensec_security, bool talloc_free(gensec_krb5_state); return NT_STATUS_INTERNAL_ERROR; } - ok = setup_kaddr(&peer_krb5_addr, &ss); + ok = smb_krb5_sockaddr_to_kaddr(&ss, &peer_krb5_addr); if (!ok) { - DBG_WARNING("setup_kaddr (remote) failed\n"); + DBG_WARNING("smb_krb5_sockaddr_to_kaddr (remote) failed\n"); talloc_free(gensec_krb5_state); return NT_STATUS_INTERNAL_ERROR; } -- 2.34.1