From owner-svn-src-head@freebsd.org  Mon Nov 16 17:25:29 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 33650A30FC1;
 Mon, 16 Nov 2015 17:25:29 +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 01A421B9F;
 Mon, 16 Nov 2015 17:25:28 +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 tAGHPStt064325;
 Mon, 16 Nov 2015 17:25:28 GMT (envelope-from rodrigc@FreeBSD.org)
Received: (from rodrigc@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAGHPSHf064324;
 Mon, 16 Nov 2015 17:25:28 GMT (envelope-from rodrigc@FreeBSD.org)
Message-Id: <201511161725.tAGHPSHf064324@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:25:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r290941 - 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:25:29 -0000

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

Log:
  Replace __svc_fdset with svc_fdset.
  
  FreeBSD lacks __svc_fdset and __svc_fdsetsize.

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

Modified: head/usr.sbin/ypldap/yp.c
==============================================================================
--- head/usr.sbin/ypldap/yp.c	Mon Nov 16 17:11:11 2015	(r290940)
+++ head/usr.sbin/ypldap/yp.c	Mon Nov 16 17:25:27 2015	(r290941)
@@ -82,13 +82,12 @@ yp_disable_events(void)
 void
 yp_enable_events(void)
 {
-	int		 i;
-	extern fd_set	*__svc_fdset;
-	extern int	 __svc_fdsetsize;
+	int i;
+	extern fd_set	svc_fdset;
 	struct yp_event	*ye;
 
-	for (i = 0; i < __svc_fdsetsize; i++) {
-		if (FD_ISSET(i, __svc_fdset)) {
+	for (i = 0; i < getdtablesize(); i++) {
+		if (FD_ISSET(i, &svc_fdset)) {
 			if ((ye = calloc(1, sizeof(*ye))) == NULL)
 				fatal(NULL);
 			event_set(&ye->ye_event, i, EV_READ, yp_fd_event, NULL);