d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve blacklist support before upgrading libblacklist

Browse Source 
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
This commit is contained in:
lidl 2017-05-06 04:17:48 +00:00
parent b61116b5f3
commit 37e3555705
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libexec/ftpd/blacklist.c
View File

@ -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)

4
libexec/ftpd/blacklist_client.h
View File

@ -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)