diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-05-31 22:12:27 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-05-31 22:12:27 +0000 |
| commit | b65a2be3b9446560ae2b6e43171ccf3dddcae409 (patch) | |
| tree | 7c51db8a879fbdcc1ead5b73c8bdaa3d16edd433 /sys/kern | |
| parent | e959a3fdd8d7f5ddc058a8d1ba703af5b2722fda (diff) | |
sys_osendsyslog can go away; we have transitioned to the new version with
a flags argument
ok guenther sthen
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_pledge.c | 3 | ||||
| -rw-r--r-- | sys/kern/subr_log.c | 17 |
2 files changed, 2 insertions, 18 deletions
diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c index 887f461fe00..6ea4c3b10fa 100644 --- a/sys/kern/kern_pledge.c +++ b/sys/kern/kern_pledge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_pledge.c,v 1.167 2016/05/27 16:33:55 deraadt Exp $ */ +/* $OpenBSD: kern_pledge.c,v 1.168 2016/05/31 22:12:26 deraadt Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org> @@ -108,7 +108,6 @@ const uint64_t pledge_syscalls[SYS_MAXSYSCALL] = { [SYS___get_tcb] = PLEDGE_ALWAYS, [SYS_pledge] = PLEDGE_ALWAYS, [SYS_sendsyslog] = PLEDGE_ALWAYS, /* stack protector reporting */ - [SYS_osendsyslog] = PLEDGE_ALWAYS, /* obsolete sendsyslog */ [SYS_thrkill] = PLEDGE_ALWAYS, /* raise, abort, stack pro */ [SYS_utrace] = PLEDGE_ALWAYS, /* ltrace(1) from ld.so */ diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c index 9455332d8b5..c6abf642139 100644 --- a/sys/kern/subr_log.c +++ b/sys/kern/subr_log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_log.c,v 1.44 2016/05/19 09:40:30 bluhm Exp $ */ +/* $OpenBSD: subr_log.c,v 1.45 2016/05/31 22:12:26 deraadt Exp $ */ /* $NetBSD: subr_log.c,v 1.11 1996/03/30 22:24:44 christos Exp $ */ /* @@ -349,21 +349,6 @@ logioctl(dev_t dev, u_long com, caddr_t data, int flag, struct proc *p) } int -sys_osendsyslog(struct proc *p, void *v, register_t *retval) -{ - struct sys_osendsyslog_args /* { - syscallarg(const void *) buf; - syscallarg(size_t) nbyte; - } */ *uap = v; - struct sys_sendsyslog_args oap; - - SCARG(&oap, buf) = SCARG(uap, buf); - SCARG(&oap, nbyte) = SCARG(uap, nbyte); - SCARG(&oap, flags) = 0; - return sys_sendsyslog(p, &oap, retval); -} - -int sys_sendsyslog(struct proc *p, void *v, register_t *retval) { struct sys_sendsyslog_args /* { |