From be4b7933989ece7e02d7c2dfb6d1fd3b8d5e49c2 Mon Sep 17 00:00:00 2001 From: Kurt Lidl Date: Sat, 6 May 2017 04:17:48 +0000 Subject: [PATCH] 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 --- libexec/ftpd/blacklist.c | 4 ++-- libexec/ftpd/blacklist_client.h | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libexec/ftpd/blacklist.c b/libexec/ftpd/blacklist.c index 85f90b5352d7..7aca755f7d2d 100644 --- a/libexec/ftpd/blacklist.c +++ b/libexec/ftpd/blacklist.c @@ -33,8 +33,8 @@ #include #include -#include "blacklist_client.h" #include +#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) diff --git a/libexec/ftpd/blacklist_client.h b/libexec/ftpd/blacklist_client.h index 7ac6fd11ed27..391b49c9bdfd 100644 --- a/libexec/ftpd/blacklist_client.h +++ b/libexec/ftpd/blacklist_client.h @@ -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)