diff options
| author | Jeremy Allison <jra@samba.org> | 2007-11-02 10:25:34 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-11-02 10:25:34 -0700 |
| commit | e075b3692bb2c9507231f0662010fc55c1b506c4 (patch) | |
| tree | ece2f7f175588f838be4d403c461f7407fcf1bb4 /source3/lib/util_sock.c | |
| parent | 78cdd6e7eca44346377346fa6d84a9b59a8f5624 (diff) | |
| download | samba-e075b3692bb2c9507231f0662010fc55c1b506c4.tar.gz samba-e075b3692bb2c9507231f0662010fc55c1b506c4.tar.bz2 samba-e075b3692bb2c9507231f0662010fc55c1b506c4.zip | |
Fix Solaris by ensuring we use the IPv4 or IPv6 length
in any getnameinfo calls.
Jeremy
(This used to be commit 4d7badb0c44f287034f58d9a412e662c0fbecdc9)
Diffstat (limited to 'source3/lib/util_sock.c')
| -rw-r--r-- | source3/lib/util_sock.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c index bbcbcacb4a..b4fda54ebd 100644 --- a/source3/lib/util_sock.c +++ b/source3/lib/util_sock.c @@ -495,7 +495,7 @@ bool is_address_any(const struct sockaddr_storage *psa) Print out an IPv4 or IPv6 address from a struct sockaddr_storage. ****************************************************************************/ -char *print_sockaddr_len(char *dest, +static char *print_sockaddr_len(char *dest, size_t destlen, const struct sockaddr_storage *psa, socklen_t psalen) @@ -503,7 +503,7 @@ char *print_sockaddr_len(char *dest, if (destlen > 0) { dest[0] = '\0'; } - (void)getnameinfo((const struct sockaddr *)psa, + (void)sys_getnameinfo((const struct sockaddr *)psa, psalen, dest, destlen, NULL, 0, @@ -519,7 +519,8 @@ char *print_sockaddr(char *dest, size_t destlen, const struct sockaddr_storage *psa) { - return print_sockaddr_len(dest, destlen, psa, sizeof(*psa)); + return print_sockaddr_len(dest, destlen, psa, + sizeof(struct sockaddr_storage)); } /**************************************************************************** |