From owner-svn-src-all@FreeBSD.ORG  Sat Feb 13 23:56:20 2010
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 510DF106566B;
	Sat, 13 Feb 2010 23:56:20 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 096C28FC0C;
	Sat, 13 Feb 2010 23:56:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1DNuJwY099148;
	Sat, 13 Feb 2010 23:56:19 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1DNuJFW099146;
	Sat, 13 Feb 2010 23:56:19 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201002132356.o1DNuJFW099146@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Sat, 13 Feb 2010 23:56:19 +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: r203848 - head/sys/fs/nfsserver
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: Sat, 13 Feb 2010 23:56:20 -0000

Author: rmacklem
Date: Sat Feb 13 23:56:19 2010
New Revision: 203848
URL: http://svn.freebsd.org/changeset/base/203848

Log:
  This fixes the experimental NFS server so that it won't crash in the
  caching code for IPv6 by fixing a typo that used the incorrect variable.
  It also fixes the indentation of the statement above it.
  
  Reported by:	simon AT comsys.ntu-kpi.kiev.ua
  MFC after:	5 days

Modified:
  head/sys/fs/nfsserver/nfs_nfsdcache.c

Modified: head/sys/fs/nfsserver/nfs_nfsdcache.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdcache.c	Sat Feb 13 21:38:15 2010	(r203847)
+++ head/sys/fs/nfsserver/nfs_nfsdcache.c	Sat Feb 13 23:56:19 2010	(r203848)
@@ -386,9 +386,9 @@ loop:
 		newrp->rc_inet = saddr->sin_addr.s_addr;
 	else if (saddr->sin_family == AF_INET6) {
 		saddr6 = (struct sockaddr_in6 *)saddr;
-		NFSBCOPY((caddr_t)&saddr6->sin6_addr,(caddr_t)&newrp->rc_inet6,
-			sizeof (struct in6_addr));
-		rp->rc_flag |= RC_INETIPV6;
+		NFSBCOPY((caddr_t)&saddr6->sin6_addr, (caddr_t)&newrp->rc_inet6,
+		    sizeof (struct in6_addr));
+		newrp->rc_flag |= RC_INETIPV6;
 	}
 	LIST_INSERT_HEAD(hp, newrp, rc_hash);
 	TAILQ_INSERT_TAIL(&nfsrvudplru, newrp, rc_lru);