r25510: Now we're returning the port instead of using a global,

remember to use ntohs. Hopefully will fix the build farm.
Jeremy.

diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c
index bcc1e8e15e54bae64d0d3fc01245b567f113e203..f77fcc9968bb5a9a39ed3e06baa79b5cc24de507 100644 (file)
--- a/source/lib/util_sock.c
+++ b/source/lib/util_sock.c
@@ -319,12 +319,12 @@ ssize_t read_udp_v4_socket(int fd,
        }
 
        if (psa->ss_family != AF_INET) {
-               DEBUG(2,("read_udp_v4_socket:: invalid address family %d "
+               DEBUG(2,("read_udp_v4_socket: invalid address family %d "
                        "(not IPv4)\n", (int)psa->ss_family));
                return 0;
        }
 
-       DEBUG(10,("read_udp_socket: ip %s port %d read: %lu\n",
+       DEBUG(10,("read_udp_v4_socket: ip %s port %d read: %lu\n",
                        inet_ntoa(si->sin_addr),
                        si->sin_port,
                        (unsigned long)ret));

diff --git a/source/libsmb/nmblib.c b/source/libsmb/nmblib.c
index 74deb91a73a1e1d414b3fd2c30e58b0c03f8a890..61e24eb6f9b282d10655294252bb4da40ac83e46 100644 (file)
--- a/source/libsmb/nmblib.c
+++ b/source/libsmb/nmblib.c
@@ -789,7 +789,7 @@ struct packet_struct *read_packet(int fd,enum packet_type packet_type)
                        length,
                        packet_type,
                        si->sin_addr,
-                       si->sin_port);
+                       ntohs(si->sin_port));
        if (!packet)
                return NULL;