From owner-svn-src-head@freebsd.org  Sat May  6 04:17:50 2017
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 17C15D60934;
 Sat,  6 May 2017 04:17:50 +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 C0EF717CB;
 Sat,  6 May 2017 04:17:49 +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 v464Hmjh035518;
 Sat, 6 May 2017 04:17:48 GMT (envelope-from lidl@FreeBSD.org)
Received: (from lidl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v464HmhO035516;
 Sat, 6 May 2017 04:17:48 GMT (envelope-from lidl@FreeBSD.org)
Message-Id: <201705060417.v464HmhO035516@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: Sat, 6 May 2017 04:17:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r317862 - head/libexec/ftpd
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.23
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: Sat, 06 May 2017 04:17:50 -0000

Author: lidl
Date: Sat May  6 04:17:48 2017
New Revision: 317862
URL: https://svnweb.freebsd.org/changeset/base/317862

Log:
  Improve blacklist support before upgrading libblacklist
  
  The locally declared enum of blacklistd actions needs to be
  hidden when the soon to be committed changes to libblacklist
  are brought into the tree.  Fix the type of the "msg" parameter
  to match the library.
  
  There should be no functional changes.
  
  MFC after:	3 days
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/libexec/ftpd/blacklist.c
  head/libexec/ftpd/blacklist_client.h

Modified: head/libexec/ftpd/blacklist.c
==============================================================================
--- head/libexec/ftpd/blacklist.c	Sat May  6 02:43:26 2017	(r317861)
+++ head/libexec/ftpd/blacklist.c	Sat May  6 04:17:48 2017	(r317862)
@@ -33,8 +33,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "blacklist_client.h"
 #include <blacklist.h>
+#include "blacklist_client.h"
 
 static struct blacklist *blstate;
 extern int use_blacklist;
@@ -48,7 +48,7 @@ blacklist_init(void)
 }
 
 void
-blacklist_notify(int action, int fd, char *msg)
+blacklist_notify(int action, int fd, const char *msg)
 {
 
 	if (blstate == NULL)

Modified: head/libexec/ftpd/blacklist_client.h
==============================================================================
--- head/libexec/ftpd/blacklist_client.h	Sat May  6 02:43:26 2017	(r317861)
+++ head/libexec/ftpd/blacklist_client.h	Sat May  6 04:17:48 2017	(r317862)
@@ -31,14 +31,16 @@
 #ifndef BLACKLIST_CLIENT_H
 #define BLACKLIST_CLIENT_H
 
+#ifndef BLACKLIST_API_ENUM
 enum {
 	BLACKLIST_AUTH_OK = 0,
 	BLACKLIST_AUTH_FAIL
 };
+#endif
 
 #ifdef USE_BLACKLIST
 void blacklist_init(void);
-void blacklist_notify(int, int, char *);
+void blacklist_notify(int, int, const char *);
 
 #define BLACKLIST_INIT() blacklist_init()
 #define BLACKLIST_NOTIFY(x, y, z) blacklist_notify(x, y, z)