From: Alan T. DeKok <aland@freeradius.org>
Date: Sun, 17 Apr 2022 13:45:12 +0000 (-0400)
Subject: remove dead code.  CID #1469168
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ed2932b0d5ad0a638ed003cdcb5a2fe94aff9fe;p=thirdparty%2Ffreeradius-server.git

remove dead code.  CID #1469168
---

diff --git a/src/lib/util/socket.c b/src/lib/util/socket.c
index cb49d9970f8..c17947225f7 100644
--- a/src/lib/util/socket.c
+++ b/src/lib/util/socket.c
@@ -405,11 +405,10 @@ int fr_socket_client_udp(fr_ipaddr_t *src_ipaddr, uint16_t *src_port, fr_ipaddr_
 	 *	FreeBSD jail issues.  We bind to 0.0.0.0, but the
 	 *	kernel instead binds us to a 1.2.3.4.  So once the
 	 *	socket is bound, ask it what it's IP address is.
+	 *
+	 *	If the caller asks for only one, well, too bad.
 	 */
-	if (src_port) {
-		fr_ipaddr_t		my_ipaddr;
-		uint16_t		my_port;
-
+	if (src_ipaddr && src_port) {
 		salen = sizeof(salocal);
 		memset(&salocal, 0, salen);
 		if (getsockname(sockfd, (struct sockaddr *) &salocal, &salen) < 0) {
@@ -418,12 +417,6 @@ int fr_socket_client_udp(fr_ipaddr_t *src_ipaddr, uint16_t *src_port, fr_ipaddr_
 			return -1;
 		}
 
-		/*
-		 *	Return these if the caller cared.
-		 */
-		if (!src_ipaddr) src_ipaddr = &my_ipaddr;
-		if (!src_port) src_port = &my_port;
-
 		if (fr_ipaddr_from_sockaddr(src_ipaddr, src_port, &salocal, salen) < 0) {
 			close(sockfd);
 			return -1;