summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2014-07-11 13:08:04 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2014-07-11 13:08:04 +0000
commit0767e93bbdc739b9f00ec77aaa5e8fd93f930bcb (patch)
treeecfbbb9a65a7d44af9a7dfdba1712d0447e5c003 /usr.bin
parent9a84b24d728f1dbb6f1de9bbb6e268072ef58664 (diff)
Grok the new /dev/klog LIOCSFD ioctl associated with sendsyslog(2)
ok matthew guenther miod tedu
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/kdump/Makefile3
-rw-r--r--usr.bin/kdump/mkioctls5
2 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
index 185f966f719..b5704e26408 100644
--- a/usr.bin/kdump/Makefile
+++ b/usr.bin/kdump/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2014/03/18 09:11:31 kettenis Exp $
+# $OpenBSD: Makefile,v 1.28 2014/07/11 13:08:03 deraadt Exp $
LDSTATIC=${STATIC}
PROG= kdump
@@ -27,6 +27,7 @@ ioctl.c: ${.CURDIR}/Makefile ${.CURDIR}/mkioctls
${SYS_DIR}/net80211/ieee80211_ioctl.h \
${SYS_DIR}/netinet6/in6_var.h \
${SYS_DIR}/sys/tty.h \
+ ${SYS_DIR}/sys/syslog.h \
${SYS_DIR}/sys/ataio.h \
${SYS_DIR}/sys/audioio.h \
${SYS_DIR}/sys/cdio.h \
diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls
index d215313e8fe..648e8fb798e 100644
--- a/usr.bin/kdump/mkioctls
+++ b/usr.bin/kdump/mkioctls
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $OpenBSD: mkioctls,v 1.32 2014/03/18 09:11:31 kettenis Exp $
+# $OpenBSD: mkioctls,v 1.33 2014/07/11 13:08:03 deraadt Exp $
#
# Copyright (c) 1994
@@ -72,6 +72,7 @@ BEGIN {
print "#include <sys/scanio.h>"
print "#include <sys/scsiio.h>"
print "#include <sys/tty.h>"
+ print "#include <sys/syslog.h>"
print "#include <sys/videoio.h>"
print "#include <crypto/cryptodev.h>"
print "#include <dev/biovar.h>"
@@ -90,7 +91,7 @@ BEGIN {
print ""
}
-/^[ ]*#[ ]*define[ ]+(ATAIO|AUDIO_|BIOC|CDIO|CIOC|CHIO|DIOC|DRM|GPIO|TIO|FIO|MTIOC|SIO|OSIO|SESIOC_|SIOC|PCIOC|PPPIOC|PPPOE|RIOC|RND|STRIOC|SCIOC|OSCIOC|TUN|USB|VIDIOC|VNDIOC|WSKBD|WSMOUSE|WSDISPLAY|WSMUX|PTM)[A-Z_0-9]*[ ]+(DRM)?_IO/ {
+/^[ ]*#[ ]*define[ ]+(ATAIO|AUDIO_|BIOC|CDIO|CIOC|CHIO|DIOC|DRM|GPIO|TIO|FIO|MTIOC|LIOC|SIO|OSIO|SESIOC_|SIOC|PCIOC|PPPIOC|PPPOE|RIOC|RND|STRIOC|SCIOC|OSCIOC|TUN|USB|VIDIOC|VNDIOC|WSKBD|WSMOUSE|WSDISPLAY|WSMUX|PTM)[A-Z_0-9]*[ ]+(DRM)?_IO/ {
# find where the name starts
for (i = 1; i <= NF; i++)