Module Name: src
Committed By: pgoyette
Date: Fri May 4 08:13:18 UTC 2018
Modified Files:
src/sys/compat/common [pgoyette-compat]: uipc_syscalls_43.c
Log Message:
Undo merge of changes from HEAD. This will get re-done properly
at the next sync-with-HEAD (which will also pull in other changes
needed).
To generate a diff of this commit:
cvs rdiff -u -r1.47.14.3 -r1.47.14.4 src/sys/compat/common/uipc_syscalls_43.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/common/uipc_syscalls_43.c
diff -u src/sys/compat/common/uipc_syscalls_43.c:1.47.14.3 src/sys/compat/common/uipc_syscalls_43.c:1.47.14.4
--- src/sys/compat/common/uipc_syscalls_43.c:1.47.14.3 Fri May 4 02:38:46 2018
+++ src/sys/compat/common/uipc_syscalls_43.c Fri May 4 08:13:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_syscalls_43.c,v 1.47.14.3 2018/05/04 02:38:46 pgoyette Exp $ */
+/* $NetBSD: uipc_syscalls_43.c,v 1.47.14.4 2018/05/04 08:13:18 pgoyette Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1990, 1993
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_43.c,v 1.47.14.3 2018/05/04 02:38:46 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_43.c,v 1.47.14.4 2018/05/04 08:13:18 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -233,7 +233,7 @@ compat_43_sys_recvmsg(struct lwp *l, con
msg.msg_iov = omsg.msg_iov;
msg.msg_flags = (SCARG(uap, flags) & MSG_USERFLAGS) | MSG_IOVUSRSPACE;
- error = do_sys_recvmsg(l, SCARG(uap, s), &msg, NULL, &from,
+ error = do_sys_recvmsg(l, SCARG(uap, s), &msg, NULL, 0, &from,
omsg.msg_accrights != NULL ? &control : NULL, retval);
if (error != 0)
return error;
@@ -380,7 +380,7 @@ compat_43_sys_sendmsg(struct lwp *l, con
goto bad;
return do_sys_sendmsg(l, SCARG(uap, s), &msg, SCARG(uap, flags),
- retval);
+ NULL, 0, retval);
bad:
if (nam != NULL)
