| @@ -1,53 +1,57 @@ | | | @@ -1,53 +1,57 @@ |
1 | /* $NetBSD: internal.h,v 1.12 2015/01/27 19:40:37 christos Exp $ */ | | 1 | /* $NetBSD: internal.h,v 1.13 2015/10/14 16:01:29 christos Exp $ */ |
2 | | | 2 | |
3 | /*- | | 3 | /*- |
4 | * Copyright (c) 2015 The NetBSD Foundation, Inc. | | 4 | * Copyright (c) 2015 The NetBSD Foundation, Inc. |
5 | * All rights reserved. | | 5 | * All rights reserved. |
6 | * | | 6 | * |
7 | * This code is derived from software contributed to The NetBSD Foundation | | 7 | * This code is derived from software contributed to The NetBSD Foundation |
8 | * by Christos Zoulas. | | 8 | * by Christos Zoulas. |
9 | * | | 9 | * |
10 | * Redistribution and use in source and binary forms, with or without | | 10 | * Redistribution and use in source and binary forms, with or without |
11 | * modification, are permitted provided that the following conditions | | 11 | * modification, are permitted provided that the following conditions |
12 | * are met: | | 12 | * are met: |
13 | * 1. Redistributions of source code must retain the above copyright | | 13 | * 1. Redistributions of source code must retain the above copyright |
14 | * notice, this list of conditions and the following disclaimer. | | 14 | * notice, this list of conditions and the following disclaimer. |
15 | * 2. Redistributions in binary form must reproduce the above copyright | | 15 | * 2. Redistributions in binary form must reproduce the above copyright |
16 | * notice, this list of conditions and the following disclaimer in the | | 16 | * notice, this list of conditions and the following disclaimer in the |
17 | * documentation and/or other materials provided with the distribution. | | 17 | * documentation and/or other materials provided with the distribution. |
18 | * | | 18 | * |
19 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | | 19 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS |
20 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | | 20 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED |
21 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | | 21 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
22 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | | 22 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS |
23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | | 23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | | 24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
25 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | | 25 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | | 26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | | 27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | | 28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
29 | * POSSIBILITY OF SUCH DAMAGE. | | 29 | * POSSIBILITY OF SUCH DAMAGE. |
30 | */ | | 30 | */ |
31 | #ifndef _INTERNAL_H | | 31 | #ifndef _INTERNAL_H |
32 | #define _INTERNAL_H | | 32 | #define _INTERNAL_H |
33 | | | 33 | |
34 | #ifndef _PATH_BLCONF | | 34 | #ifndef _PATH_BLCONF |
35 | #define _PATH_BLCONF "/etc/blacklistd.conf" | | 35 | #define _PATH_BLCONF "/etc/blacklistd.conf" |
36 | #endif | | 36 | #endif |
37 | #ifndef _PATH_BLCONTROL | | 37 | #ifndef _PATH_BLCONTROL |
38 | #define _PATH_BLCONTROL "/libexec/blacklistd-helper" | | 38 | #define _PATH_BLCONTROL "/libexec/blacklistd-helper" |
39 | #endif | | 39 | #endif |
40 | #ifndef _PATH_BLSTATE | | 40 | #ifndef _PATH_BLSTATE |
41 | #define _PATH_BLSTATE "/var/db/blacklistd.db" | | 41 | #define _PATH_BLSTATE "/var/db/blacklistd.db" |
42 | #endif | | 42 | #endif |
43 | | | 43 | |
44 | extern struct confset rconf, lconf; | | 44 | extern struct confset rconf, lconf; |
45 | extern int debug; | | 45 | extern int debug; |
46 | extern const char *rulename; | | 46 | extern const char *rulename; |
47 | extern const char *controlprog; | | 47 | extern const char *controlprog; |
48 | extern struct ifaddrs *ifas; | | 48 | extern struct ifaddrs *ifas; |
49 | | | 49 | |
| | | 50 | #if !defined(__syslog_attribute__) && !defined(__syslog__) |
| | | 51 | #define __syslog__ __printf__ |
| | | 52 | #endif |
| | | 53 | |
50 | void (*lfun)(int, const char *, ...) | | 54 | void (*lfun)(int, const char *, ...) |
51 | __attribute__((__format__(__printf__, 2, 3))); | | 55 | __attribute__((__format__(__syslog__, 2, 3))); |
52 | | | 56 | |
53 | #endif /* _INTERNAL_H */ | | 57 | #endif /* _INTERNAL_H */ |