From owner-svn-src-all@freebsd.org  Tue Nov 15 23:03:58 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 3A539C44D51;
 Tue, 15 Nov 2016 23:03:58 +0000 (UTC)
 (envelope-from lidl@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 0951E139D;
 Tue, 15 Nov 2016 23:03:57 +0000 (UTC)
 (envelope-from lidl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAFN3viK006273;
 Tue, 15 Nov 2016 23:03:57 GMT (envelope-from lidl@FreeBSD.org)
Received: (from lidl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAFN3vkh006272;
 Tue, 15 Nov 2016 23:03:57 GMT (envelope-from lidl@FreeBSD.org)
Message-Id: <201611152303.uAFN3vkh006272@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: lidl set sender to
 lidl@FreeBSD.org using -f
From: Kurt Lidl <lidl@FreeBSD.org>
Date: Tue, 15 Nov 2016 23:03:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r308703 - stable/11/libexec/ftpd
X-SVN-Group: stable-11
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.23
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Nov 2016 23:03:58 -0000

Author: lidl
Date: Tue Nov 15 23:03:57 2016
New Revision: 308703
URL: https://svnweb.freebsd.org/changeset/base/308703

Log:
  MFC r308567: Fix build when WITHOUT_BLACKLIST=yes is specified
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/libexec/ftpd/ftpd.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/libexec/ftpd/ftpd.c
==============================================================================
--- stable/11/libexec/ftpd/ftpd.c	Tue Nov 15 22:30:25 2016	(r308702)
+++ stable/11/libexec/ftpd/ftpd.c	Tue Nov 15 23:03:57 2016	(r308703)
@@ -93,10 +93,7 @@ __FBSDID("$FreeBSD$");
 #include <security/pam_appl.h>
 #endif
 
-#ifdef USE_BLACKLIST
 #include "blacklist_client.h"
-#endif
-
 #include "pathnames.h"
 #include "extern.h"