diff --git a/configure.ac b/configure.ac index b7a69b8..384db61 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.64]) -AC_INIT([tallow], [12], [auke-jan.h.kok@intel.com]) +AC_INIT([tallow], [13], [auke-jan.h.kok@intel.com]) AM_INIT_AUTOMAKE([foreign]) AC_CONFIG_FILES([Makefile]) diff --git a/tallow.1 b/tallow.1 index c2480e7..272b598 100644 --- a/tallow.1 +++ b/tallow.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "TALLOW" "1" "March 2018" "" "" +.TH "TALLOW" "1" "October 2018" "" "" . .SH "NAME" \fBtallow\fR diff --git a/tallow.c b/tallow.c index 9210954..697e05d 100644 --- a/tallow.c +++ b/tallow.c @@ -394,8 +394,11 @@ int main(void) if (!has_ipv6) fprintf(stdout, "ipv6 support disabled.\n"); - if (!whitelist) + if (!whitelist) { whitelist_add("127.0.0.1"); + whitelist_add("192.168."); + whitelist_add("10."); + } r = sd_journal_open(&j, SD_JOURNAL_LOCAL_ONLY); if (r < 0) { diff --git a/tallow.conf.5 b/tallow.conf.5 index 650b98f..2d77265 100644 --- a/tallow.conf.5 +++ b/tallow.conf.5 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "TALLOW" "5" "January 2018" "" "" +.TH "TALLOW" "5" "October 2018" "" "" . .SH "NAME" \fBtallow\fR @@ -25,7 +25,7 @@ This file is read on startup by the tallow(1) daemon, and can be used to provide \fBexpires\fR=\fB\fR The number of seconds that IP addresses are blocked for\. Note that due to the implementation, IP addresses may be blocked for much longer than this period\. If IP addresses are seen, but not blocked within this period, they are also removed from the watch list\. Defaults to 3600s\. . .P -\fBwhitelist\fR=\fB\fR Specify an IP address or \fBpattern\fR that should never be blocked\. Multiple IP addresses can be included by repeating the \fBwhitelist\fR option several times\. By default, only 127\.0\.0\.1 is whitelisted\. +\fBwhitelist\fR=\fB\fR Specify an IP address or \fBpattern\fR that should never be blocked\. Multiple IP addresses can be included by repeating the \fBwhitelist\fR option several times\. By default, 127\.0\.0\.1, 192\.168\., and 10\. are whitelisted\. If you create a manual whitelist, you must include these entries if you want to continue them to be whitelisted as well, otherwise they will be omitted from the whitelist\. . .P If the last character of the listed ip adress is a \fB\.\fR or a \fB:\fR, then the matching is only performed on the leftmost characters of an IP address against the whitelist entry\. For instance, if you whitelist \fB10\.\fR then all IP addresses in the \fB10/8\fR subnet mask will match this whitelist entry and never be blocked\. diff --git a/tallow.conf.5.md b/tallow.conf.5.md index f04253b..0be79cb 100644 --- a/tallow.conf.5.md +++ b/tallow.conf.5.md @@ -33,8 +33,10 @@ watch list. Defaults to 3600s. `whitelist`=`` Specify an IP address or `pattern` that should never be blocked. Multiple IP addresses can be included by repeating the -`whitelist` option several times. By default, only 127.0.0.1 is -whitelisted. +`whitelist` option several times. By default, 127.0.0.1, 192.168., and +10. are whitelisted. If you create a manual whitelist, you must include +these entries if you want to continue them to be whitelisted as +well, otherwise they will be omitted from the whitelist. If the last character of the listed ip adress is a `.` or a `:`, then the matching is only performed on the leftmost characters of an IP