From 22f566c39b564c39eca40a76bf1dfece96d7ece5 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 23 Oct 2008 21:08:13 +0200
Subject: [PATCH] Move set_sockaddr_port to libutil.

---
 lib/util/util_net.c     | 14 ++++++++++++++
 source3/lib/util_sock.c | 12 ------------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/lib/util/util_net.c b/lib/util/util_net.c
index eb5e2255c99..228393a2bbf 100644
--- a/lib/util/util_net.c
+++ b/lib/util/util_net.c
@@ -408,3 +408,17 @@ bool is_address_any(const struct sockaddr *psa)
 	}
 	return false;
 }
+
+void set_sockaddr_port(struct sockaddr *psa, uint16_t port)
+{
+#if defined(HAVE_IPV6)
+	if (psa->sa_family == AF_INET6) {
+		((struct sockaddr_in6 *)psa)->sin6_port = htons(port);
+	}
+#endif
+	if (psa->sa_family == AF_INET) {
+		((struct sockaddr_in *)psa)->sin_port = htons(port);
+	}
+}
+
+
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 667dbf6dad7..5721f412d62 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -241,18 +241,6 @@ static int get_socket_port(int fd)
 }
 #endif
 
-void set_sockaddr_port(struct sockaddr_storage *psa, uint16 port)
-{
-#if defined(HAVE_IPV6)
-	if (psa->ss_family == AF_INET6) {
-		((struct sockaddr_in6 *)psa)->sin6_port = htons(port);
-	}
-#endif
-	if (psa->ss_family == AF_INET) {
-		((struct sockaddr_in *)psa)->sin_port = htons(port);
-	}
-}
-
 const char *client_name(int fd)
 {
 	return get_peer_name(fd,false);
-- 
2.34.1