1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
--- qmail-smtpd.c.orig 2009-12-23 15:20:45.000000000 -0200
+++ qmail-smtpd.c 2009-12-23 15:23:40.000000000 -0200
@@ -136,6 +136,27 @@
logs(s1,s2,s3,s4,s5,s6,s7);
return;
}
+void err_rbl(s1,s2,s3,s4,s5,s6,s7) char *s1, *s2, *s3, *s4, *s5, *s6, *s7; {
+ char *rblmatch;
+ stralloc rblmessage = {0};
+ stralloc new_s1 = {0};
+
+ rblmatch = env_get("RBLMATCH");
+
+ if (!stralloc_copys(&rblmessage,"553 sorry, your IP is listed on a RBL list ")) die_nomem();
+ if (!stralloc_cats(&rblmessage,rblmatch)) die_nomem();
+ if (!stralloc_cats(&rblmessage," (#5.7.1)\r\n")) die_nomem();
+ if (!stralloc_0(&rblmessage)) die_nomem();
+
+ if (!stralloc_copys(&new_s1, s1)) die_nomem();
+ if (!stralloc_cats(&new_s1, " ")) die_nomem();
+ if (!stralloc_cats(&new_s1, rblmatch)) die_nomem();
+ if (!stralloc_0(&new_s1)) die_nomem();
+
+ out(rblmessage.s);
+ logs(new_s1.s,s2,s3,s4,s5,s6,s7);
+ return;
+ }
void err_brcptto(s1,s2,s3,s4,s5,s6,s7) char *s1, *s2, *s3, *s4, *s5, *s6, *s7; {
out("550 sorry, your envelope recipient is in my badrcptto list (#5.7.1)\r\n");
logs(s1,s2,s3,s4,s5,s6,s7);
@@ -282,6 +303,8 @@
char *auth;
char *reqauth;
+char *rbl2smtpd;
+char *rblmatch;
int smtpauth = 0;
int seenauth = 0;
@@ -404,6 +427,9 @@
if (env_get("UCSPITLS")) starttls = 1;
if (starttls) reqttls = env_get("REQUIRETLS");
+ rbl2smtpd = env_get("RBL2SMTPD");
+ rblmatch = env_get("RBLMATCH");
+
delivermailto = env_get("DELIVERTO");
if (delivermailto) {
if (!stralloc_cats(&mailto,delivermailto)) die_nomem();
@@ -909,6 +935,10 @@
return;
}
+ if (!seenauth && rbl2smtpd && rblmatch && str_len(rblmatch) != 0) {
+ err_rbl("Reject::RBL::RBL_Listed:",protocol.s,remoteip,remotehost,helohost.s,mailfrom.s,addr.s);
+ return;
+ }
if (tarpitcount && flagerrcpts >= tarpitcount) { /* Tarpitting et al. */
if (tarpitdelay == 999) flagnotorious++;
err_rcpts("Reject::RCPT::Toomany_Rcptto:",protocol.s,remoteip,remotehost,helohost.s,mailfrom.s,addr.s);
|
