diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2020-06-15 13:44:37 +0000 | 
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2020-06-15 13:44:37 +0000 | 
| commit | e6a066ac3e8fdf1fcd4f3f2ca1b82bd55eb2da2a (patch) | |
| tree | d6a99e0065ab5d39b716a0d5272ef21055745e0c /lib/bl.c | |
| parent | 6fa63e1816f543db1c68320f442e30f95d8f9f78 (diff) | |
Diffstat (limited to 'lib/bl.c')
| -rw-r--r-- | lib/bl.c | 11 | 
1 files changed, 5 insertions, 6 deletions
| diff --git a/lib/bl.c b/lib/bl.c index 9f93b91f4c8f5..2be77a4224831 100644 --- a/lib/bl.c +++ b/lib/bl.c @@ -1,4 +1,4 @@ -/*	$NetBSD: bl.c,v 1.28 2016/07/29 17:13:09 christos Exp $	*/ +/*	$NetBSD: bl.c,v 1.29 2020/03/10 13:36:08 roy Exp $	*/  /*-   * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@  #endif  #include <sys/cdefs.h> -__RCSID("$NetBSD: bl.c,v 1.28 2016/07/29 17:13:09 christos Exp $"); +__RCSID("$NetBSD: bl.c,v 1.29 2020/03/10 13:36:08 roy Exp $");  #include <sys/param.h>  #include <sys/types.h> @@ -68,7 +68,7 @@ typedef struct {  	char bl_data[];  } bl_message_t; -struct blacklist { +struct blocklist {  #ifdef _REENTRANT  	pthread_mutex_t b_mutex;  # define BL_INIT(b)	pthread_mutex_init(&b->b_mutex, NULL) @@ -207,7 +207,7 @@ bl_init(bl_t b, bool srv)  			BL_UNLOCK(b);  			return -1;  		} -		bl_log(b->b_fun, LOG_DEBUG, "Connected to blacklist server", +		bl_log(b->b_fun, LOG_DEBUG, "Connected to blocklist server",  		    __func__);  	} @@ -495,12 +495,11 @@ bl_recv(bl_t b)  	}  	if (got != (GOT_CRED|GOT_FD)) { -		bl_log(b->b_fun, LOG_ERR, "message missing %s %s",  +		bl_log(b->b_fun, LOG_ERR, "message missing %s %s",  #if GOT_CRED != 0  		    (got & GOT_CRED) == 0 ? "cred" :  #endif  		    "", (got & GOT_FD) == 0 ? "fd" : ""); -			  		return NULL;  	} | 
