From owner-svn-src-projects@freebsd.org  Wed Jun 13 23:48:50 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3BB9C10029C5
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed, 13 Jun 2018 23:48:50 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id DDEB683121;
 Wed, 13 Jun 2018 23:48:49 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BBC242065E;
 Wed, 13 Jun 2018 23:48:49 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5DNmnUe053311;
 Wed, 13 Jun 2018 23:48:49 GMT (envelope-from rmacklem@FreeBSD.org)
Received: (from rmacklem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5DNmnq4053310;
 Wed, 13 Jun 2018 23:48:49 GMT (envelope-from rmacklem@FreeBSD.org)
Message-Id: <201806132348.w5DNmnq4053310@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to
 rmacklem@FreeBSD.org using -f
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Wed, 13 Jun 2018 23:48:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r335095 - projects/pnfs-planb-server/usr.sbin/nfsd
X-SVN-Group: projects
X-SVN-Commit-Author: rmacklem
X-SVN-Commit-Paths: projects/pnfs-planb-server/usr.sbin/nfsd
X-SVN-Commit-Revision: 335095
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Jun 2018 23:48:50 -0000

Author: rmacklem
Date: Wed Jun 13 23:48:49 2018
New Revision: 335095
URL: https://svnweb.freebsd.org/changeset/base/335095

Log:
  Although they both seem to work, ai_addrlen seems like the better length
  to check than ai_addr->sa_len.

Modified:
  projects/pnfs-planb-server/usr.sbin/nfsd/nfsd.c

Modified: projects/pnfs-planb-server/usr.sbin/nfsd/nfsd.c
==============================================================================
--- projects/pnfs-planb-server/usr.sbin/nfsd/nfsd.c	Wed Jun 13 23:30:54 2018	(r335094)
+++ projects/pnfs-planb-server/usr.sbin/nfsd/nfsd.c	Wed Jun 13 23:48:49 2018	(r335095)
@@ -1250,7 +1250,7 @@ parse_dsserver(const char *optionarg, struct nfsd_nfsd
 			err(1, "getaddrinfo pnfs: %s %s", cp,
 			    gai_strerror(ecode));
 		if (ai_tcp->ai_addr->sa_family != AF_INET ||
-		    ai_tcp->ai_addr->sa_len < sizeof(sin))
+		    ai_tcp->ai_addrlen < sizeof(sin))
 			err(1, "getaddrinfo() returned non-INET address");
 		/* Mips cares about sockaddr_in alignment, so copy the addr. */
 		memcpy(&sin, ai_tcp->ai_addr, sizeof(sin));