From owner-svn-src-head@freebsd.org  Mon Nov 16 17:11:12 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B4989A30C56;
 Mon, 16 Nov 2015 17:11:12 +0000 (UTC)
 (envelope-from rodrigc@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 mx1.freebsd.org (Postfix) with ESMTPS id 7FE521FD4;
 Mon, 16 Nov 2015 17:11:12 +0000 (UTC)
 (envelope-from rodrigc@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAGHBBUL060356;
 Mon, 16 Nov 2015 17:11:11 GMT (envelope-from rodrigc@FreeBSD.org)
Received: (from rodrigc@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAGHBBxH060355;
 Mon, 16 Nov 2015 17:11:11 GMT (envelope-from rodrigc@FreeBSD.org)
Message-Id: <201511161711.tAGHBBxH060355@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rodrigc set sender to
 rodrigc@FreeBSD.org using -f
From: Craig Rodrigues <rodrigc@FreeBSD.org>
Date: Mon, 16 Nov 2015 17:11:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r290940 - head/usr.sbin/ypldap
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Nov 2015 17:11:12 -0000

Author: rodrigc
Date: Mon Nov 16 17:11:11 2015
New Revision: 290940
URL: https://svnweb.freebsd.org/changeset/base/290940

Log:
  Do not use SA_LEN() to dereference sa_len.
  
  FreeBSD lacks the SA_LEN() macro.

Modified:
  head/usr.sbin/ypldap/ldapclient.c

Modified: head/usr.sbin/ypldap/ldapclient.c
==============================================================================
--- head/usr.sbin/ypldap/ldapclient.c	Mon Nov 16 17:08:51 2015	(r290939)
+++ head/usr.sbin/ypldap/ldapclient.c	Mon Nov 16 17:11:11 2015	(r290940)
@@ -71,14 +71,14 @@ client_aldap_open(struct ypldap_addr *ad
 		char			 hbuf[NI_MAXHOST], sbuf[NI_MAXSERV];
 		struct sockaddr		*sa = (struct sockaddr *)&p->ss;
 
-		if (getnameinfo(sa, SA_LEN(sa), hbuf, sizeof(hbuf), sbuf,
+		if (getnameinfo(sa, sa->sa_len, hbuf, sizeof(hbuf), sbuf,
 			sizeof(sbuf), NI_NUMERICHOST | NI_NUMERICSERV))
 				errx(1, "could not get numeric hostname");
 
 		if ((fd = socket(sa->sa_family, SOCK_STREAM, 0)) < 0)
 			return NULL;
 
-		if (connect(fd, sa, SA_LEN(sa)) == 0)
+		if (connect(fd, sa, sa->sa_len) == 0)
 			break;
 
 		warn("connect to %s port %s (%s) failed", hbuf, sbuf, "tcp");