From owner-svn-src-all@FreeBSD.ORG  Mon Jun  8 03:15:27 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 84758106566C;
	Mon,  8 Jun 2009 03:15:27 +0000 (UTC) (envelope-from kan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 729A28FC19;
	Mon,  8 Jun 2009 03:15:27 +0000 (UTC) (envelope-from kan@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n583FRK7014056;
	Mon, 8 Jun 2009 03:15:27 GMT (envelope-from kan@svn.freebsd.org)
Received: (from kan@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n583FRSG014055;
	Mon, 8 Jun 2009 03:15:27 GMT (envelope-from kan@svn.freebsd.org)
Message-Id: <200906080315.n583FRSG014055@svn.freebsd.org>
From: Alexander Kabaev <kan@FreeBSD.org>
Date: Mon, 8 Jun 2009 03:15:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193674 - head/usr.sbin/mountd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 03:15:28 -0000

Author: kan
Date: Mon Jun  8 03:15:27 2009
New Revision: 193674
URL: http://svn.freebsd.org/changeset/base/193674

Log:
  The change r192913 has added dependency on IP_RECVDSTADDR being
  set for RPC UDP sockets. Mountd uses internal libc fuctions
  directly and bypasses generic socket initialization completely,
  so we need to set IP_RECVDSTADDR here to match the libc behavior.

Modified:
  head/usr.sbin/mountd/mountd.c

Modified: head/usr.sbin/mountd/mountd.c
==============================================================================
--- head/usr.sbin/mountd/mountd.c	Mon Jun  8 02:13:24 2009	(r193673)
+++ head/usr.sbin/mountd/mountd.c	Mon Jun  8 03:15:27 2009	(r193674)
@@ -568,6 +568,13 @@ create_service(struct netconfig *nconf)
 					continue;
 				}
 			}
+			if (si.si_socktype == SOCK_DGRAM &&
+			    setsockopt(fd, IPPROTO_IP, IP_RECVDSTADDR, &one,
+			        sizeof one) < 0) {
+				syslog(LOG_ERR,
+				    "can't disable v4-in-v6 on IPv6 socket");
+				exit(1);
+			}
 			break;
 		case AF_INET6:
 			if (inet_pton(AF_INET6, hosts[nhostsbak],