From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Tue, 5 Sep 2023 03:27:29 +0000 (+1200)
Subject: lib:krb5_wrap: Eliminate redundant code from smb_krb5_sockaddr_to_kaddr()
X-Git-Tag: tevent-0.16.0~578
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8ca4dead240eca6487ec77c2a505d90407e83bb;p=thirdparty%2Fsamba.git

lib:krb5_wrap: Eliminate redundant code from smb_krb5_sockaddr_to_kaddr()

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 20f3000c277..1df6d47070d 100644
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -146,9 +146,6 @@ const krb5_data *krb5_princ_component(krb5_context context,
  * WRAPPING FUNCTIONS
  **********************************************************/
 
-#if defined(HAVE_ADDR_TYPE_IN_KRB5_ADDRESS)
-/* HEIMDAL */
-
 /**
  * @brief Stores the address of a 'struct sockaddr_storage' into a krb5_address
  *
@@ -163,6 +160,8 @@ bool smb_krb5_sockaddr_to_kaddr(struct sockaddr_storage *paddr,
 				krb5_address *pkaddr)
 {
 	memset(pkaddr, '\0', sizeof(krb5_address));
+#if defined(HAVE_ADDR_TYPE_IN_KRB5_ADDRESS)
+/* HEIMDAL */
 #ifdef HAVE_IPV6
 	if (paddr->ss_family == AF_INET6) {
 		pkaddr->addr_type = KRB5_ADDRESS_INET6;
@@ -177,25 +176,8 @@ bool smb_krb5_sockaddr_to_kaddr(struct sockaddr_storage *paddr,
 		pkaddr->address.data = (char *)&(((struct sockaddr_in *)paddr)->sin_addr);
 		return true;
 	}
-	return false;
-}
 #elif defined(HAVE_ADDRTYPE_IN_KRB5_ADDRESS)
 /* MIT */
-
-/**
- * @brief Stores the address of a 'struct sockaddr_storage' into 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 the address in.
- *
- * @return True on success, false if an error occurred.
- */
-bool smb_krb5_sockaddr_to_kaddr(struct sockaddr_storage *paddr,
-				krb5_address *pkaddr)
-{
-	memset(pkaddr, '\0', sizeof(krb5_address));
 #ifdef HAVE_IPV6
 	if (paddr->ss_family == AF_INET6) {
 		pkaddr->addrtype = ADDRTYPE_INET6;
@@ -210,11 +192,11 @@ bool smb_krb5_sockaddr_to_kaddr(struct sockaddr_storage *paddr,
 		pkaddr->contents = (krb5_octet *)&(((struct sockaddr_in *)paddr)->sin_addr);
 		return true;
 	}
-	return false;
-}
 #else
 #error UNKNOWN_ADDRTYPE
 #endif
+	return false;
+}
 
 krb5_error_code smb_krb5_mk_error(krb5_context context,
 				  krb5_error_code error_code,