Rename the system call sendsyslog2 to sendsyslog. Keep the old one

as osendsyslog for a while.  The three argument variant is the only
one that will stay.
input kettenis@;  OK deraadt@

5 files changed, 20 insertions, 20 deletions

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index e29de20d869..40e2300c392 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init_sysent.c,v 1.179 2015/11/24 23:50:50 deraadt Exp $	*/
+/*	$OpenBSD: init_sysent.c,v 1.180 2016/03/21 22:41:29 bluhm Exp $	*/
 
 /*
  * System call switch table.
@@ -198,8 +198,8 @@ struct sysent sysent[] = {
 	    sys_getpgrp },			/* 81 = getpgrp */
 	{ 2, s(struct sys_setpgid_args), 0,
 	    sys_setpgid },			/* 82 = setpgid */
-	{ 2, s(struct sys_sendsyslog_args), 0,
-	    sys_sendsyslog },			/* 83 = sendsyslog */
+	{ 2, s(struct sys_osendsyslog_args), 0,
+	    sys_osendsyslog },			/* 83 = osendsyslog */
 	{ 4, s(struct sys_utimensat_args), 0,
 	    sys_utimensat },			/* 84 = utimensat */
 	{ 2, s(struct sys_futimens_args), 0,
@@ -256,8 +256,8 @@ struct sysent sysent[] = {
 	    sys_pselect },			/* 110 = pselect */
 	{ 1, s(struct sys_sigsuspend_args), 0,
 	    sys_sigsuspend },			/* 111 = sigsuspend */
-	{ 3, s(struct sys_sendsyslog2_args), 0,
-	    sys_sendsyslog2 },			/* 112 = sendsyslog2 */
+	{ 3, s(struct sys_sendsyslog_args), 0,
+	    sys_sendsyslog },			/* 112 = sendsyslog */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 113 = obsolete orecvmsg */
 	{ 0, 0, 0,
diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c
index 1c711883fdf..9c22ad8a6c2 100644
--- a/sys/kern/kern_pledge.c
+++ b/sys/kern/kern_pledge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_pledge.c,v 1.158 2016/03/16 06:46:39 ratchov Exp $	*/
+/*	$OpenBSD: kern_pledge.c,v 1.159 2016/03/21 22:41:29 bluhm Exp $	*/
 
 /*
  * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
@@ -108,7 +108,7 @@ const uint64_t pledge_syscalls[SYS_MAXSYSCALL] = {
 	[SYS___get_tcb] = PLEDGE_ALWAYS,
 	[SYS_pledge] = PLEDGE_ALWAYS,
 	[SYS_sendsyslog] = PLEDGE_ALWAYS,	/* stack protector reporting */
-	[SYS_sendsyslog2] = 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 27dcc512c75..7ecdfa9185a 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_log.c,v 1.37 2016/01/13 17:05:25 stefan Exp $	*/
+/*	$OpenBSD: subr_log.c,v 1.38 2016/03/21 22:41:29 bluhm Exp $	*/
 /*	$NetBSD: subr_log.c,v 1.11 1996/03/30 22:24:44 christos Exp $	*/
 
 /*
@@ -349,24 +349,24 @@ logioctl(dev_t dev, u_long com, caddr_t data, int flag, struct proc *p)
 }
 
 int
-sys_sendsyslog(struct proc *p, void *v, register_t *retval)
+sys_osendsyslog(struct proc *p, void *v, register_t *retval)
 {
-	struct sys_sendsyslog_args /* {
+	struct sys_osendsyslog_args /* {
 		syscallarg(const void *) buf;
 		syscallarg(size_t) nbyte;
 	} */ *uap = v;
-	struct sys_sendsyslog2_args oap;
+	struct sys_sendsyslog_args oap;
 
 	SCARG(&oap, buf) = SCARG(uap, buf);
 	SCARG(&oap, nbyte) = SCARG(uap, nbyte);
 	SCARG(&oap, flags) = 0;
-	return sys_sendsyslog2(p, &oap, retval);
+	return sys_sendsyslog(p, &oap, retval);
 }
 
 int
-sys_sendsyslog2(struct proc *p, void *v, register_t *retval)
+sys_sendsyslog(struct proc *p, void *v, register_t *retval)
 {
-	struct sys_sendsyslog2_args /* {
+	struct sys_sendsyslog_args /* {
 		syscallarg(const void *) buf;
 		syscallarg(size_t) nbyte;
 		syscallarg(int) flags;
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 426ddaa65af..a230c9b59e7 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscalls.c,v 1.178 2015/11/24 23:50:50 deraadt Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.179 2016/03/21 22:41:29 bluhm Exp $	*/
 
 /*
  * System call names.
@@ -103,7 +103,7 @@ char *syscallnames[] = {
 	"setgroups",			/* 80 = setgroups */
 	"getpgrp",			/* 81 = getpgrp */
 	"setpgid",			/* 82 = setpgid */
-	"sendsyslog",			/* 83 = sendsyslog */
+	"osendsyslog",			/* 83 = osendsyslog */
 	"utimensat",			/* 84 = utimensat */
 	"futimens",			/* 85 = futimens */
 	"kbind",			/* 86 = kbind */
@@ -132,7 +132,7 @@ char *syscallnames[] = {
 	"ppoll",			/* 109 = ppoll */
 	"pselect",			/* 110 = pselect */
 	"sigsuspend",			/* 111 = sigsuspend */
-	"sendsyslog2",			/* 112 = sendsyslog2 */
+	"sendsyslog",			/* 112 = sendsyslog */
 	"#113 (obsolete orecvmsg)",		/* 113 = obsolete orecvmsg */
 	"#114 (obsolete osendmsg)",		/* 114 = obsolete osendmsg */
 	"#115 (obsolete vtrace)",		/* 115 = obsolete vtrace */
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 117b7bdbad0..dcf18dcb8ac 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
-;	$OpenBSD: syscalls.master,v 1.166 2015/11/24 23:47:17 deraadt Exp $
+;	$OpenBSD: syscalls.master,v 1.167 2016/03/21 22:41:29 bluhm Exp $
 ;	$NetBSD: syscalls.master,v 1.32 1996/04/23 10:24:21 mycroft Exp $
 
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
@@ -186,7 +186,7 @@
 			    const gid_t *gidset); }
 81	STD		{ int sys_getpgrp(void); }
 82	STD		{ int sys_setpgid(pid_t pid, pid_t pgid); }
-83	STD		{ int sys_sendsyslog(const void *buf, size_t nbyte); }
+83	STD		{ int sys_osendsyslog(const void *buf, size_t nbyte); }
 84	STD		{ int sys_utimensat(int fd, const char *path, \
 			    const struct timespec *times, int flag); }
 85	STD		{ int sys_futimens(int fd, \
@@ -233,7 +233,7 @@
 			    fd_set *ex, const struct timespec *ts, \
 			    const sigset_t *mask); }
 111	STD		{ int sys_sigsuspend(int mask); }
-112	STD		{ int sys_sendsyslog2(const void *buf, size_t nbyte, \
+112	STD		{ int sys_sendsyslog(const void *buf, size_t nbyte, \
 			    int flags); }
 113	OBSOL		orecvmsg
 114	OBSOL		osendmsg