From e4478d7e46876142b5f75cfc93ef649a6bde05ae Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Fri, 18 Jan 2019 21:30:06 +0000 Subject: 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 --- libexec/talkd/talkd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libexec/talkd') diff --git a/libexec/talkd/talkd.c b/libexec/talkd/talkd.c index 984afbce905a4..eb609207b1569 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); -- cgit v1.3