Milter-greylist

--- milter-greylist-4.2.5/greylist.conf.5       2010-04-14
10:32:49.000000000 -0500
+++ milter-greylist-4.2.5.patched/greylist.conf.5       2010-07-06
08:32:04.000000000 -0500
@@ -1247,6 +1247,9 @@
  .I %R
  shortcut to %Rh:%Rm:Rs
  .TP
+.I %Hs
+SpamAssassin score
+.TP
  .I %%
  a single % character
  .PP


--- milter-greylist-4.2.5/milter-greylist.c     2010-04-17
22:56:40.000000000 -0500
+++ milter-greylist-4.2.5.patched/milter-greylist.c     2010-07-05
16:55:56.000000000 -0500
@@ -2403,6 +2403,20 @@
                 fstr_len = 1;

                 switch (*ptok) {
+               case 'H': { /* SpamAssassin information */
+               #ifdef USE_SPAMD
+                       fstr_len = 2;
+                       switch(*(ptok + 1)) {
+                       case 's': { /* score */
+                           char buf[QSTRLEN + 1];
+                           (void)snprintf(buf, sizeof(buf),
"%g",(double)priv->priv_spamd_score10/10);
+                           mystrncat(&outstr, buf, &outmaxlen);
+                           break;
+                           }
+                       }
+               #endif /* USE_SPAMD */
+                       break;
+                       }
                 case 'h':       /* Hello string */
                         mystrncat(&outstr, priv->priv_helo, &outmaxlen);
                         break;