X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmod-blacklist.c;h=61d0adf5072f973d10065af23ae4bffa273863ce;hb=df0167a7589aae5bba7c966843fc006da17050c9;hp=0e4b58b0d3233758d3eac04f0d63648805f7a316;hpb=f2f3dba74e9e3ffb429240529c9c1e4b8050cb60;p=srvx.git diff --git a/src/mod-blacklist.c b/src/mod-blacklist.c index 0e4b58b..61d0adf 100644 --- a/src/mod-blacklist.c +++ b/src/mod-blacklist.c @@ -53,9 +53,9 @@ static struct { } conf; #if defined(GCC_VARMACROS) -# define blacklist_debug(ARGS...) do { if (conf.debug_bot && conf.debug_channel) send_channel_notice(conf.debug_channel, conf.debug_bot, ARGS); } while (0) +# define blacklist_debug(ARGS...) do { if (conf.debug_bot && conf.debug_channel) send_channel_message(conf.debug_channel, conf.debug_bot, ARGS); } while (0) #elif defined(C99_VARMACROS) -# define blacklist_debug(...) do { if (conf.debug_bot && conf.debug_channel) send_channel_notice(conf.debug_channel, conf.debug_bot, __VA_ARGS__); } while (0) +# define blacklist_debug(...) do { if (conf.debug_bot && conf.debug_channel) send_channel_message(conf.debug_channel, conf.debug_bot, __VA_ARGS__); } while (0) #endif static void @@ -155,7 +155,7 @@ dnsbl_hit(struct sar_request *req, struct dns_header *hdr, struct dns_rr *rr, un target[0] = '*'; target[1] = '@'; strcpy(target + 2, data->client_ip); - gline_add(self->name, target, zone->duration, reason, now, now, 1); + gline_add(self->name, target, zone->duration, reason, now, now, 0, 1); } } free(txt); @@ -194,7 +194,7 @@ blacklist_check_user(struct userNode *user) target[1] = '@'; strcpy(target + 2, host); /* We do not prepend AUTO here so it can be done in the blacklist file. */ - gline_add(self->name, target, conf.gline_duration, reason, now, now, 1); + gline_add(self->name, target, conf.gline_duration, reason, now, now, 0, 1); } /* Figure out the base part of a DNS blacklist hostname. */