Don't require HELO name in check_from

andrenth · Sep 14, 2012 · 03c6bf8 · 03c6bf8
1 parent c9e070a
commit 03c6bf8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/SPF.ml b/lib/SPF.ml
@@ -110,11 +110,12 @@ let check_helo server client_addr helo =
     free_request req in
   finalize check close req
 
-let check_from server client_addr helo from =
+let check_from server client_addr from =
+  if not (String.contains from '@') then
+    raise (SPF_error ("invalid from address: " ^ from));
   let req = request server in
   let check req =
     set_inet_addr req client_addr;
-    set_helo_domain req helo;
     set_envelope_from req from;
     query_mailfrom req in
   let close req =

diff --git a/lib/SPF.mli b/lib/SPF.mli
@@ -30,7 +30,7 @@ val free_request : request -> unit
 
 val check_helo : server -> Unix.inet_addr -> string -> response
 
-val check_from : server -> Unix.inet_addr -> string -> string -> response
+val check_from : server -> Unix.inet_addr -> string -> response
 
 val result : response -> result
 val reason : response -> reason