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)
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
