[src/netbsd-1-6]: src/sys/compat/linux/common Pullup rev 1.46 (requested by t...

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/12b887dbdd6a
branches:  netbsd-1-6
changeset: 530932:12b887dbdd6a
user:      jmc <jmc%NetBSD.org@localhost>
date:      Wed Oct 22 03:43:03 2003 +0000

description:
Pullup rev 1.46 (requested by tv in ticket #1425)

make credentials work on the i386 by passing the original msg structure.

diffstat:

 sys/compat/linux/common/linux_socket.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r ef93fe8d6d72 -r 12b887dbdd6a sys/compat/linux/common/linux_socket.c
--- a/sys/compat/linux/common/linux_socket.c    Tue Oct 21 22:51:07 2003 +0000
+++ b/sys/compat/linux/common/linux_socket.c    Wed Oct 22 03:43:03 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_socket.c,v 1.39 2002/05/12 18:30:32 jschauma Exp $       */
+/*     $NetBSD: linux_socket.c,v 1.39.4.1 2003/10/22 03:43:03 jmc Exp $        */
 
 /*-
  * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.39 2002/05/12 18:30:32 jschauma Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.39.4.1 2003/10/22 03:43:03 jmc Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -300,7 +300,7 @@
        struct msghdr   msg;
        int             error;
        struct sys_sendmsg_args bsa;
-       struct msghdr *nmsg = NULL;
+       struct msghdr *nmsg = (struct msghdr *)SCARG(uap, msg);
 
        error = copyin(SCARG(uap, msg), (caddr_t)&msg, sizeof(msg));
        if (error)