diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2011-07-08 19:19:21 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2011-07-08 19:19:21 +0000 |
| commit | af21571dfdf9a479699a5f87cc6d7e13f3315878 (patch) | |
| tree | 8430a58948b3d82c9a3856c27520ab5e4c07dd45 /sys/compat/linux | |
| parent | 6bb0ebb43acd42f0035abe5d4541b10047d2a788 (diff) | |
remove all traces of COMPAT_09 and COMPAT_10. ok deraadt
Diffstat (limited to 'sys/compat/linux')
| -rw-r--r-- | sys/compat/linux/linux_misc.c | 15 | ||||
| -rw-r--r-- | sys/compat/linux/syscalls.master | 5 |
2 files changed, 16 insertions, 4 deletions
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index ec237c17bed..0b62285fa8c 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: linux_misc.c,v 1.70 2011/07/08 05:01:27 matthew Exp $ */ +/* $OpenBSD: linux_misc.c,v 1.71 2011/07/08 19:19:20 tedu Exp $ */ /* $NetBSD: linux_misc.c,v 1.27 1996/05/20 01:59:21 fvdl Exp $ */ /*- @@ -1453,3 +1453,16 @@ linux_sys_mprotect(struct proc *p, void *v, register_t *retval) SCARG(uap, prot) |= PROT_READ; return (sys_mprotect(p, uap, retval)); } + +int +linux_sys_setdomainname(struct proc *p, void *v, register_t *retval) +{ + struct linux_sys_setdomainname_args *uap = v; + int error, mib[1]; + + if ((error = suser(p, 0))) + return (error); + mib[0] = KERN_DOMAINNAME; + return (kern_sysctl(mib, 1, NULL, NULL, SCARG(uap, name), + SCARG(uap, len), p)); +} diff --git a/sys/compat/linux/syscalls.master b/sys/compat/linux/syscalls.master index 2b6cc4d3ddf..1682314d652 100644 --- a/sys/compat/linux/syscalls.master +++ b/sys/compat/linux/syscalls.master @@ -1,4 +1,4 @@ - $OpenBSD: syscalls.master,v 1.58 2011/07/08 05:01:27 matthew Exp $ + $OpenBSD: syscalls.master,v 1.59 2011/07/08 19:19:20 tedu Exp $ ; $NetBSD: syscalls.master,v 1.15 1995/12/18 14:35:10 fvdl Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -213,8 +213,7 @@ 119 STD { int linux_sys_sigreturn(struct linux_sigcontext *scp); } 120 STD { int linux_sys_clone(int flags, void *stack, \ void *parent_tidptr, void *tls, void *child_tidptr); } -121 NOARGS { int compat_09_sys_setdomainname(char *name, \ - int len); } +121 STD { int linux_sys_setdomainname(char *name, int len); } 122 STD { int linux_sys_uname(struct linux_utsname *up); } #ifdef __i386__ 123 STD { int linux_sys_modify_ldt(int func, void *ptr, \ |