Reactivate get_socket_port

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 678f0873740761fa80bf1cc90957abc9ccb447d8..cc442422e852bbf87cda99b8d91c40a497538bc1 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1358,6 +1358,7 @@ char *print_canonical_sockaddr(TALLOC_CTX *ctx,
                        const struct sockaddr_storage *pss);
 void set_sockaddr_port(struct sockaddr *psa, uint16_t port);
 const char *client_name(int fd);
+int get_socket_port(int fd);
 const char *client_addr(int fd, char *addr, size_t addrlen);
 const char *client_socket_addr(int fd, char *addr, size_t addr_len);
 int client_socket_port(int fd);

diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 5f9d4768bafb04a8cbc3b91d4aaf4922f9a30884..cbd7b983c71486e5ee8ee2966e2129dd24e54204 100644 (file)
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -208,13 +208,11 @@ static const char *get_socket_addr(int fd, char *addr_buf, size_t addr_len)
        return print_sockaddr_len(addr_buf, addr_len, (struct sockaddr *)&sa, length);
 }
 
-#if 0
-/* Not currently used. JRA. */
 /****************************************************************************
  Return the port number we've bound to on a socket.
 ****************************************************************************/
 
-static int get_socket_port(int fd)
+int get_socket_port(int fd)
 {
        struct sockaddr_storage sa;
        socklen_t length = sizeof(sa);
@@ -239,7 +237,6 @@ static int get_socket_port(int fd)
        }
        return -1;
 }
-#endif
 
 const char *client_name(int fd)
 {