diff options
| author | lidl <lidl@FreeBSD.org> | 2017-05-12 15:03:09 +0000 |
|---|---|---|
| committer | lidl <lidl@FreeBSD.org> | 2017-05-12 15:03:09 +0000 |
| commit | 944a090aa688380c81b0463caeb4f0b7d66eb392 (patch) | |
| tree | c5637d81a0fa91ea00556869186ee8c0e43f58b1 /libexec | |
| parent | 68b0a07815daf3ca4392e023784588f2ebc2625e (diff) | |
| download | FreeBSD-src-944a090aa688380c81b0463caeb4f0b7d66eb392.zip FreeBSD-src-944a090aa688380c81b0463caeb4f0b7d66eb392.tar.gz | |
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
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ftpd/blacklist.c | 4 | ||||
| -rw-r--r-- | 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 85f90b5..7aca755 100644 --- a/libexec/ftpd/blacklist.c +++ b/libexec/ftpd/blacklist.c @@ -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) diff --git a/libexec/ftpd/blacklist_client.h b/libexec/ftpd/blacklist_client.h index 7ac6fd1..391b49c 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) |
