projects
/
srvx.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'HostServ' of ssh://git.pk910.de:16110/srvx into HostServ
[srvx.git]
/
src
/
mod-blacklist.c
diff --git
a/src/mod-blacklist.c
b/src/mod-blacklist.c
index c06ef7d761e80d00eb1160148650eba56eb60aca..e202f739302e9de2a8c4a90fb338eb406d762520 100644
(file)
--- a/
src/mod-blacklist.c
+++ b/
src/mod-blacklist.c
@@
-142,8
+142,11
@@
dnsbl_hit(struct sar_request *req, struct dns_header *hdr, struct dns_rr *rr, un
message = "client is blacklisted";
}
message = "client is blacklisted";
}
+ /* Prepend "AUTO " prefix so the g-lined are put in a different snomask */
+ strcpy(reason, "AUTO ");
+
/* Expand elements of the message as necessary. */
/* Expand elements of the message as necessary. */
- do_expandos(reason
, sizeof(reason)
, message, "%txt%", (txt ? txt : "(no-txt)"), "%ip%", data->client_ip, NULL);
+ do_expandos(reason
+ 5, sizeof(reason) - 5
, message, "%txt%", (txt ? txt : "(no-txt)"), "%ip%", data->client_ip, NULL);
if (zone->debug) {
blacklist_debug("DNSBL match: [%s] %s (%s)", zone->zone, data->client_ip, reason);
if (zone->debug) {
blacklist_debug("DNSBL match: [%s] %s (%s)", zone->zone, data->client_ip, reason);
@@
-152,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);
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);
}
}
free(txt);
@@
-190,7
+193,8
@@
blacklist_check_user(struct userNode *user)
target[0] = '*';
target[1] = '@';
strcpy(target + 2, host);
target[0] = '*';
target[1] = '@';
strcpy(target + 2, host);
- gline_add(self->name, target, conf.gline_duration, reason, now, now, 1);
+ /* 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, 0, 1);
}
/* Figure out the base part of a DNS blacklist hostname. */
}
/* Figure out the base part of a DNS blacklist hostname. */