diff options
| author | Jeremy Allison <jra@samba.org> | 2007-10-05 01:11:33 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:31:11 -0500 |
| commit | 3dbb3d4c269ecf28f25d857aa8a4e5c1109ee5e8 (patch) | |
| tree | 1724cbd06383c4a03fb100ef1dfa73afeb84d7b6 | |
| parent | d75b175cf9a41e744c4f6445667e4ade72d42ac6 (diff) | |
| download | samba-3dbb3d4c269ecf28f25d857aa8a4e5c1109ee5e8.tar.gz samba-3dbb3d4c269ecf28f25d857aa8a4e5c1109ee5e8.tar.bz2 samba-3dbb3d4c269ecf28f25d857aa8a4e5c1109ee5e8.zip | |
r25510: Now we're returning the port instead of using a global,
remember to use ntohs. Hopefully will fix the build farm.
Jeremy.
(This used to be commit 5174acccb589edbfbe4ba633f4178f7200d7d6c4)
| -rw-r--r-- | source3/lib/util_sock.c | 4 | ||||
| -rw-r--r-- | source3/libsmb/nmblib.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c index bcc1e8e15e..f77fcc9968 100644 --- a/source3/lib/util_sock.c +++ b/source3/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/source3/libsmb/nmblib.c b/source3/libsmb/nmblib.c index 74deb91a73..61e24eb6f9 100644 --- a/source3/libsmb/nmblib.c +++ b/source3/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; |