summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2002-12-04 17:37:40 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2002-12-04 17:37:40 +0000
commita60100de5a360f82985b6d533e9cc441dba79ad5 (patch)
tree74379ee3d8dcb348815dd019e791bbab22c6324b /sys/dev
parent5cd0bb5ed98fe0a56cc7f182cf640a322da3e076 (diff)
rename the clone ioctl to avoid clashing w/ the sockio; provos@ ok
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/systrace.c3
-rw-r--r--sys/dev/systrace.h4
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/systrace.c b/sys/dev/systrace.c
index 06612e658c4..0c622f5fdbe 100644
--- a/sys/dev/systrace.c
+++ b/sys/dev/systrace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: systrace.c,v 1.25 2002/11/10 04:34:56 art Exp $ */
+/* $OpenBSD: systrace.c,v 1.26 2002/12/04 17:37:39 mickey Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
@@ -522,6 +522,7 @@ systraceioctl(dev, cmd, data, flag, p)
int fd, error;
switch (cmd) {
+ case STRIOCCLONE:
case SYSTR_CLONE:
MALLOC(fst, struct fsystrace *, sizeof(struct fsystrace),
M_XDATA, M_WAITOK);
diff --git a/sys/dev/systrace.h b/sys/dev/systrace.h
index 7ba97dffaa9..beb30a63851 100644
--- a/sys/dev/systrace.h
+++ b/sys/dev/systrace.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: systrace.h,v 1.11 2002/10/25 23:22:58 fgsch Exp $ */
+/* $OpenBSD: systrace.h,v 1.12 2002/12/04 17:37:39 mickey Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
@@ -34,6 +34,7 @@
#include <sys/ioccom.h>
+ /* XXX kill this after a major release */
#define SYSTR_CLONE _IOR('s', 1, int)
#define SYSTR_EMULEN 8 /* sync with sys proc */
@@ -140,6 +141,7 @@ struct systrace_replace {
size_t strr_offlen[SYSTR_MAXARGS];
};
+#define STRIOCCLONE _IOR('s', 100, int)
#define STRIOCATTACH _IOW('s', 101, pid_t)
#define STRIOCDETACH _IOW('s', 102, pid_t)
#define STRIOCANSWER _IOW('s', 103, struct systrace_answer)