diff options
| author | Leo Famulari <leo@famulari.name> | 2017-07-10 14:37:53 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-07-10 14:37:53 -0400 |
| commit | c8eb2b8c60d954b4522555a5c75b7bb4be5a1a4d (patch) | |
| tree | 3a2e569e333ccd9265237868d3f46b2d1e04e3a9 /nix | |
| parent | ad22c7185395a52bd90ea5890a2ac79f44d00352 (diff) | |
| parent | 61adfb00b11cc16a70e60f19fd8e0a838a3ef608 (diff) | |
| download | patches-c8eb2b8c60d954b4522555a5c75b7bb4be5a1a4d.tar patches-c8eb2b8c60d954b4522555a5c75b7bb4be5a1a4d.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/nix-daemon/nix-daemon.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nix/nix-daemon/nix-daemon.cc b/nix/nix-daemon/nix-daemon.cc index b20225b3b0..7d26b61354 100644 --- a/nix/nix-daemon/nix-daemon.cc +++ b/nix/nix-daemon/nix-daemon.cc @@ -887,13 +887,11 @@ static void acceptConnection(int fdSocket) if (remoteAddr.ss_family == AF_INET) { struct sockaddr_in *addr = (struct sockaddr_in *) &remoteAddr; - struct in_addr inaddr = { addr->sin_addr }; - result = inet_ntop(AF_INET, &inaddr, + result = inet_ntop(AF_INET, &addr->sin_addr, address_str, sizeof address_str); } else if (remoteAddr.ss_family == AF_INET6) { struct sockaddr_in6 *addr = (struct sockaddr_in6 *) &remoteAddr; - struct in6_addr inaddr = { addr->sin6_addr }; - result = inet_ntop(AF_INET6, &inaddr, + result = inet_ntop(AF_INET6, &addr->sin6_addr, address_str, sizeof address_str); } else { result = NULL; |