From: Florian Weimer <fweimer@redhat.com>
Date: Mon, 22 Jul 2019 09:01:17 +0000 (+0200)
Subject: Linux: Include <linux/sockios.h> in <bits/socket.h> under __USE_MISC
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Ffw%2Flinux-5.2;p=thirdparty%2Fglibc.git

Linux: Include <linux/sockios.h> in <bits/socket.h> under __USE_MISC

Historically, <asm/socket.h> (which is included from <bits/socket.h>)
provided ioctl operations for sockets.  User code accessed them
through <sys/socket.h>.  The kernel UAPI headers have removed these
definitions in favor of <linux/sockios.h>.  This commit makes them
available via <sys/socket.h> again.
---

diff --git a/ChangeLog b/ChangeLog
index 15ed1438f6a..c6dbb2e8176 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-07-22  Florian Weimer  <fweimer@redhat.com>
+
+	* sysdeps/unix/sysv/linux/bits/socket.h [__USE_MISC]: Include
+	<linux/sockios.h>.
+
 2019-07-18  Florian Weimer  <fweimer@redhat.com>
 
 	* scripts/build-many-glibcs.py (Context.checkout): Default to
diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
index 082f8b90312..ff5b705f41b 100644
--- a/sysdeps/unix/sysv/linux/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/bits/socket.h
@@ -352,6 +352,7 @@ struct ucred
 #ifdef __USE_MISC
 # include <bits/types/time_t.h>
 # include <asm/socket.h>
+# include <linux/sockios.h>
 #else
 # define SO_DEBUG 1
 # include <bits/socket-constants.h>