diff options
author | Brooks Davis <brooks@FreeBSD.org> | 2019-01-18 21:30:06 +0000 |
---|---|---|
committer | Brooks Davis <brooks@FreeBSD.org> | 2019-01-18 21:30:06 +0000 |
commit | e4478d7e46876142b5f75cfc93ef649a6bde05ae (patch) | |
tree | 7a6cf3249776d0c53db59202ed08ff9d6f4a2ef4 /libexec/talkd | |
parent | 03d9c6aa55b57d3d35756da1d2784fa3e5fabc7b (diff) | |
download | src-e4478d7e46876142b5f75cfc93ef649a6bde05ae.tar.gz src-e4478d7e46876142b5f75cfc93ef649a6bde05ae.zip |
Use a private definition of osockaddr rather then relying on type
namespace polution in sys/socket.h.
Also remove support for operation on 4.3BSD.
PR: 224529
Differential Revision: https://reviews.freebsd.org/D14505
Notes
Notes:
svn path=/head/; revision=343161
Diffstat (limited to 'libexec/talkd')
-rw-r--r-- | libexec/talkd/talkd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libexec/talkd/talkd.c b/libexec/talkd/talkd.c index 984afbce905a..eb609207b156 100644 --- a/libexec/talkd/talkd.c +++ b/libexec/talkd/talkd.c @@ -114,7 +114,8 @@ main(int argc, char *argv[]) continue; } lastmsgtime = time(0); - (void)memcpy(&ctl_addr, &mp->ctl_addr, sizeof(ctl_addr)); + (void)memcpy(&ctl_addr.sa_data, &mp->ctl_addr.sa_data, + sizeof(ctl_addr.sa_data)); ctl_addr.sa_family = ntohs(mp->ctl_addr.sa_family); ctl_addr.sa_len = sizeof(ctl_addr); process_request(mp, &response); |