From 91e3ebd0a0b9b33e74a6d175e8eb280e056872a4 Mon Sep 17 00:00:00 2001
From: guenther <>
Date: Wed, 21 Jan 2015 02:23:14 +0000
Subject: [PATCH] Delete option COMPAT_43: support for pre-sa_len binaries has
 been obsolete for a couple decades.  Keep the OSIOCGIFCONF ioctl to support
 COMPAT_LINUX but move the rest of the Linux-specific ioctl() handling into
 linux_socket.c This lets struct osockaddr finally move from sys/socket.h to
 protocols/talkd.h

ok krw@ deraadt@ mpi@
---
 src/include/protocols/talkd.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/include/protocols/talkd.h b/src/include/protocols/talkd.h
index 09503582..fae2b42b 100644
--- a/src/include/protocols/talkd.h
+++ b/src/include/protocols/talkd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: talkd.h,v 1.4 2004/01/22 21:48:02 espie Exp $	*/
+/*	$OpenBSD: talkd.h,v 1.5 2015/01/21 02:23:14 guenther Exp $	*/
 /*	$NetBSD: talkd.h,v 1.5 1995/03/04 07:59:30 cgd Exp $	*/
 
 /*
@@ -53,6 +53,11 @@
  * stream connection through which the conversation takes place.
  */
 
+struct osockaddr {
+	unsigned short	sa_family;	/* address family */
+	char		sa_data[14];	/* up to 14 bytes of direct address */
+};
+
 /*
  * Client->server request message format.
  */