diff options
author | Yann Ylavic <ylavic@apache.org> | 2020-11-23 09:33:01 +0000 |
---|---|---|
committer | Yann Ylavic <ylavic@apache.org> | 2020-11-23 09:33:01 +0000 |
commit | b38864b817471983eac0784871acdc255bd11532 (patch) | |
tree | c306c16cb58c5b6dbab6d662eb7eaafbac7893e3 /network_io | |
parent | 477b3c2eb54a0197cef3e2eb7392a6f521923597 (diff) | |
download | apr-b38864b817471983eac0784871acdc255bd11532.tar.gz |
Follow up to r1883728: uncomment the change, and fix apr_cpystrn() args orrder.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1883742 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'network_io')
-rw-r--r-- | network_io/unix/sockaddr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/network_io/unix/sockaddr.c b/network_io/unix/sockaddr.c index 412e8009f..1c807a10b 100644 --- a/network_io/unix/sockaddr.c +++ b/network_io/unix/sockaddr.c @@ -118,10 +118,10 @@ static apr_status_t get_remote_addr(apr_socket_t *sock) APR_DECLARE(apr_status_t) apr_sockaddr_ip_getbuf(char *buf, apr_size_t buflen, apr_sockaddr_t *sockaddr) { -#if APR_HAVE_SOCKADDR_UN && 0 +#if APR_HAVE_SOCKADDR_UN if (sockaddr->family == APR_UNIX) { apr_size_t len = (apr_size_t)sockaddr->ipaddr_len; - apr_cpystrn(buf, buflen < len ? buflen : len, sockaddr->ipaddr_ptr); + apr_cpystrn(buf, sockaddr->ipaddr_ptr, buflen < len ? buflen : len); return APR_SUCCESS; } #endif |