Allow wildcards in badmailfrom.

Source: http://tomclegg.net/qmail/qmail-badmailfrom-wildcard.patch
icculus · Dec 12, 2009 · 3fb0ea9 · 3fb0ea9
1 parent 52543d3
commit 3fb0ea9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/qmail-smtpd.8 b/qmail-smtpd.8
@@ -81,6 +81,10 @@ may be of the form
 .BR @\fIhost ,
 meaning every address at
 .IR host .
+A line of the form
+.BR .\fIdomain
+means every address at every host ending with
+.IR .domain .
 
 .TP 5
 .I clientca.pem

diff --git a/qmail-smtpd.c b/qmail-smtpd.c
@@ -255,8 +255,13 @@ int bmfcheck()
   if (!bmfok) return 0;
   if (constmap(&mapbmf,addr.s,addr.len - 1)) return 1;
   j = byte_rchr(addr.s,addr.len,'@');
-  if (j < addr.len)
+  if (j < addr.len) {
     if (constmap(&mapbmf,addr.s + j,addr.len - j - 1)) return 1;
+    for (j++; j < addr.len; j++)
+      if (addr.s[j] == '.') {
+	if(constmap(&mapbmf,addr.s + j,addr.len - j - 1)) return 1;
+      }
+  }
   return 0;
 }