summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1998-06-11 19:21:31 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1998-06-11 19:21:31 +0000
commitb8be5dce160c9ea7b2327f04818b786dd4fec322 (patch)
tree86ce6a0e4ba4a27cbc3c70f0fa3bf32efb3758dc
parent972db8ac87c9fdf7160f080d738040aa720f719c (diff)
do not export old structures to userland
-rw-r--r--sys/sys/ipc.h4
-rw-r--r--sys/sys/msg.h4
-rw-r--r--sys/sys/sem.h4
-rw-r--r--sys/sys/shm.h4
4 files changed, 12 insertions, 4 deletions
diff --git a/sys/sys/ipc.h b/sys/sys/ipc.h
index 2061cb4b25b..2e1949b71e2 100644
--- a/sys/sys/ipc.h
+++ b/sys/sys/ipc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipc.h,v 1.3 1998/06/11 18:32:19 deraadt Exp $ */
+/* $OpenBSD: ipc.h,v 1.4 1998/06/11 19:21:27 deraadt Exp $ */
/* $NetBSD: ipc.h,v 1.15 1996/02/09 18:25:12 christos Exp $ */
/*
@@ -62,6 +62,7 @@ struct ipc_perm {
key_t key; /* user specified msg/sem/shm key */
};
+#ifdef _KERNEL
struct oipc_perm {
ushort cuid; /* creator user id */
ushort cgid; /* creator group id */
@@ -71,6 +72,7 @@ struct oipc_perm {
ushort seq; /* sequence # (to generate unique msg/sem/shm id) */
key_t key; /* user specified msg/sem/shm key */
};
+#endif
/* common mode bits */
#define IPC_R 000400 /* read permission */
diff --git a/sys/sys/msg.h b/sys/sys/msg.h
index dcddcb1717e..d81a8fb9551 100644
--- a/sys/sys/msg.h
+++ b/sys/sys/msg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: msg.h,v 1.4 1998/06/11 18:32:21 deraadt Exp $ */
+/* $OpenBSD: msg.h,v 1.5 1998/06/11 19:21:28 deraadt Exp $ */
/* $NetBSD: msg.h,v 1.9 1996/02/09 18:25:18 christos Exp $ */
/*
@@ -50,6 +50,7 @@ struct msqid_ds {
long msg_pad4[4];
};
+#ifdef _KERNEL
struct omsqid_ds {
struct oipc_perm msg_perm; /* msg queue permission bits */
struct msg *msg_first; /* first message in the queue */
@@ -67,6 +68,7 @@ struct omsqid_ds {
long msg_pad3;
long msg_pad4[4];
};
+#endif
struct msg {
struct msg *msg_next; /* next msg in the chain */
diff --git a/sys/sys/sem.h b/sys/sys/sem.h
index 5a8d3c4e589..6fca814e76d 100644
--- a/sys/sys/sem.h
+++ b/sys/sys/sem.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sem.h,v 1.5 1998/06/11 18:32:22 deraadt Exp $ */
+/* $OpenBSD: sem.h,v 1.6 1998/06/11 19:21:29 deraadt Exp $ */
/* $NetBSD: sem.h,v 1.8 1996/02/09 18:25:29 christos Exp $ */
/*
@@ -32,6 +32,7 @@ struct semid_ds {
long sem_pad3[4]; /* SVABI/386 says I need this here */
};
+#ifdef _KERNEL
struct osemid_ds {
struct oipc_perm sem_perm; /* operation permission struct */
struct sem *sem_base; /* pointer to first semaphore in set */
@@ -44,6 +45,7 @@ struct osemid_ds {
long sem_pad2; /* SVABI/386 says I need this here */
long sem_pad3[4]; /* SVABI/386 says I need this here */
};
+#endif
/*
* semop's sops parameter structure
diff --git a/sys/sys/shm.h b/sys/sys/shm.h
index 8ba242bda7b..656cd6a8679 100644
--- a/sys/sys/shm.h
+++ b/sys/sys/shm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: shm.h,v 1.6 1998/06/11 18:32:24 deraadt Exp $ */
+/* $OpenBSD: shm.h,v 1.7 1998/06/11 19:21:30 deraadt Exp $ */
/* $NetBSD: shm.h,v 1.20 1996/04/09 20:55:35 cgd Exp $ */
/*
@@ -62,6 +62,7 @@ struct shmid_ds {
void *shm_internal; /* sysv stupidity */
};
+#ifdef _KERNEL
struct oshmid_ds {
struct oipc_perm shm_perm; /* operation permission structure */
int shm_segsz; /* size of segment in bytes */
@@ -73,6 +74,7 @@ struct oshmid_ds {
time_t shm_ctime; /* time of last change by shmctl() */
void *shm_internal; /* sysv stupidity */
};
+#endif
#ifdef _KERNEL