From owner-svn-src-all@FreeBSD.ORG  Thu Jan  3 23:21:02 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 9EAACCC1;
 Thu,  3 Jan 2013 23:21:02 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8E0BDD58;
 Thu,  3 Jan 2013 23:21:02 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r03NL2mG005405;
 Thu, 3 Jan 2013 23:21:02 GMT (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r03NL230005404;
 Thu, 3 Jan 2013 23:21:02 GMT (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201301032321.r03NL230005404@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Thu, 3 Jan 2013 23:21:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r245019 - stable/9/usr.sbin/nfsd
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Thu, 03 Jan 2013 23:21:02 -0000

Author: rmacklem
Date: Thu Jan  3 23:21:01 2013
New Revision: 245019
URL: http://svnweb.freebsd.org/changeset/base/245019

Log:
  MFC: r244447
  Post r243965 the nfsd daemon will not start up for kernels
  built without "options INET6". This patch fixes the problem.

Modified:
  stable/9/usr.sbin/nfsd/nfsd.c
Directory Properties:
  stable/9/usr.sbin/nfsd/   (props changed)

Modified: stable/9/usr.sbin/nfsd/nfsd.c
==============================================================================
--- stable/9/usr.sbin/nfsd/nfsd.c	Thu Jan  3 23:15:36 2013	(r245018)
+++ stable/9/usr.sbin/nfsd/nfsd.c	Thu Jan  3 23:21:01 2013	(r245019)
@@ -236,7 +236,7 @@ main(int argc, char **argv)
 	ip6flag = 1;
 	s = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
 	if (s == -1) {
-		if (errno != EPROTONOSUPPORT)
+		if (errno != EPROTONOSUPPORT && errno != EAFNOSUPPORT)
 			err(1, "socket");
 		ip6flag = 0;
 	} else if (getnetconfigent("udp6") == NULL ||