diff options
Diffstat (limited to 'sys/sys/ipc.h')
-rw-r--r-- | sys/sys/ipc.h | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/sys/sys/ipc.h b/sys/sys/ipc.h index 139b103..c72d913 100644 --- a/sys/sys/ipc.h +++ b/sys/sys/ipc.h @@ -69,10 +69,9 @@ typedef __uid_t uid_t; #define _UID_T_DECLARED #endif -/* - * XXX almost all members have wrong types. - */ -struct ipc_perm { +#if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \ + defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7) +struct ipc_perm_old { unsigned short cuid; /* creator user id */ unsigned short cgid; /* creator group id */ unsigned short uid; /* user id */ @@ -81,6 +80,17 @@ struct ipc_perm { unsigned short seq; /* sequence # (to generate unique ipcid) */ key_t key; /* user specified msg/sem/shm key */ }; +#endif + +struct ipc_perm { + uid_t cuid; /* creator user id */ + gid_t cgid; /* creator group id */ + uid_t uid; /* user id */ + gid_t gid; /* group id */ + mode_t mode; /* r/w permission */ + unsigned short seq; /* sequence # (to generate unique ipcid) */ + key_t key; /* user specified msg/sem/shm key */ +}; #if __BSD_VISIBLE /* common mode bits */ @@ -116,6 +126,12 @@ struct thread; struct proc; struct vmspace; +#if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \ + defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7) +void ipcperm_old2new(struct ipc_perm_old *, struct ipc_perm *); +void ipcperm_new2old(struct ipc_perm *, struct ipc_perm_old *); +#endif + int ipcperm(struct thread *, struct ipc_perm *, int); extern void (*shmfork_hook)(struct proc *, struct proc *); extern void (*shmexit_hook)(struct vmspace *); |