sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-25 17:57:42 +03:00
Code

krb5_wrap: Rename setup_kaddr()

Browse Source 
Use a better and consistent name and switch the arguments to reflect the
name.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andreas Schneider 2016-08-25 16:59:18 +02:00 committed by Andrew Bartlett
parent b72287514c
commit 81917a1162
3 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/krb5_wrap/krb5_samba.c
View File

@ -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)

3
lib/krb5_wrap/krb5_samba.h
View File

@ -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,

8
source4/auth/gensec/gensec_krb5.c
View File

@ -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;
}