--- a/src/spamass.cpp.in	Thu Aug 30 12:05:44 2007 -0700
+++ b/src/spamass.cpp.in	Thu Aug 30 14:07:09 2007 -0700
@@ -99,16 +99,17 @@
         // FQDN of this site
         macro_j = getorwarnmacro(ctx, "j", "localhost", "ENVRCPT");
 
-        // Protocol used to receive the message */
-        macro_r = getorwarnmacro(ctx, "r", "SMTP",      "ENVRCPT");
+        // Protocol used to receive the message, not really needed by spam assassin
+        macro_r = "SMTP";
 
+        // helo value we already have
         macro_s = helo;
 
-        // Sendmail binary version
-        macro_v = getorwarnmacro(ctx, "v", "8.13.0",    "ENVRCPT");
+        // Sendmail binary version, not really needed by spam assassin
+        macro_v = "8.13.0";
 
-        // Sendmail .cf version
-        macro_Z = getorwarnmacro(ctx, "Z", "8.13.0",    "ENVRCPT");
+        // Sendmail .cf version, not really needed by spam assassin
+        macro_Z = "8.13.0";
 
         // Validated sending site's address
         macro__ = getorwarnmacro(ctx, "_", "unknown",   "ENVRCPT");