From owner-p4-projects@FreeBSD.ORG  Sun Apr  8 10:47:39 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BAFD816A404; Sun,  8 Apr 2007 10:47:38 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 77CC516A401
	for <perforce@FreeBSD.org>; Sun,  8 Apr 2007 10:47:38 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 67C8D13C43E
	for <perforce@FreeBSD.org>; Sun,  8 Apr 2007 10:47:38 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l38AlchF019520
	for <perforce@FreeBSD.org>; Sun, 8 Apr 2007 10:47:38 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l38AlcGV019517
	for perforce@freebsd.org; Sun, 8 Apr 2007 10:47:38 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Sun, 8 Apr 2007 10:47:38 GMT
Message-Id: <200704081047.l38AlcGV019517@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rdivacky@FreeBSD.org using -f
From: Roman Divacky <rdivacky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 117642 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Apr 2007 10:47:39 -0000

http://perforce.freebsd.org/chv.cgi?CH=117642

Change 117642 by rdivacky@rdivacky_witten on 2007/04/08 10:47:21

	In the case of illegal values just set msg.msg_control to NULL. it lets
	ping work too.
	
	Suggested by: rwatson

Affected files ...

.. //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#14 edit

Differences ...

==== //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#14 (text+ko) ====

@@ -1034,7 +1034,7 @@
 	 * checking but now it lets ping work.
 	 */
 	if (msg.msg_control && msg.msg_controllen == 0)
-	   	msg.msg_controllen = sizeof(struct cmsghdr);
+		msg.msg_control = NULL;
 
 	if (error)
 		return (error);