svn commit: r318240 - stable/11/libexec/ftpd

[Kurt Lidl]

Author: lidl
Date: Fri May 12 15:03:09 2017
New Revision: 318240
URL: https://svnweb.freebsd.org/changeset/base/318240

Log:
  MFC r317862:
  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.
  Sponsored by:	The FreeBSD Foundation

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

Modified: stable/11/libexec/ftpd/blacklist.c
==============================================================================
--- stable/11/libexec/ftpd/blacklist.c	Fri May 12 15:00:06 2017	(r318239)
+++ stable/11/libexec/ftpd/blacklist.c	Fri May 12 15:03:09 2017	(r318240)
@@ -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: stable/11/libexec/ftpd/blacklist_client.h
==============================================================================
--- stable/11/libexec/ftpd/blacklist_client.h	Fri May 12 15:00:06 2017	(r318239)
+++ stable/11/libexec/ftpd/blacklist_client.h	Fri May 12 15:03:09 2017	(r318240)
@@ -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)