svn commit: r245019 - stable/9/usr.sbin/nfsd

[Rick Macklem]

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 ||