--- mailfront-1.16/plugin-spamassassin.c.original	2010-04-07 20:25:25.000000000 +0800
+++ mailfront-1.16/plugin-spamassassin.c	2010-04-07 20:26:32.000000000 +0800
@@ -47,6 +47,7 @@
 static const char* user;
 static int reject_spam;
 static int isspam;
+static unsigned long failsafe;
 
 static int copyit(ibuf* netin, int fdout)
 {
@@ -112,6 +113,12 @@
   return 0;
 }
 
+static const response *warn_sys(const char *s1)
+{
+  warn2sys("SpamAssassin scanning skipped: ", s1);
+  return failsafe ? 0 : &resp_internal;
+}
+
 static const response* message_end(int fd)
 {
   const char* hostname;
@@ -127,6 +134,9 @@
   struct stat st;
   int fdout;
 
+  if ((tmp = getenv("SPAMD_FAILSAFE")) && *tmp)
+    failsafe = strtoul(tmp, 0, 10);
+
   hostname = 0;
   if ((path = session_getenv("SPAMD_PATH")) != 0
       || (hostname = session_getenv("SPAMD_HOST")) != 0) {
@@ -135,7 +145,7 @@
 	&& (maxsize = strtoul(tmp, (char**)&tmp, 10)) != 0
 	&& *tmp == 0) {
       if (fstat(fd, &st) != 0)
-	return &resp_internal;
+	return warn_sys("fstat(fd, &st) != 0");
       if (st.st_size > (ssize_t)maxsize){
 	warn1("SpamAssassin scanning skipped: message larger than maximum");
 	return 0;
@@ -167,15 +177,19 @@
     else
       reject_spam = 0;
     isspam = 0;
-    if ((ip_count = resolve_ipv4name_n(hostname, ips, MAX_IPS)) <= 0)
-      return &resp_no_hostname;
+    if ((ip_count = resolve_ipv4name_n(hostname, ips, MAX_IPS)) <= 0) {
+      if (failsafe > 0)
+        return warn_sys("Could not resolve SpamAssassin hostname");
+      else
+        return &resp_no_hostname;
+    }
 
     if ((fdout = scratchfile()) == -1)
-      return &resp_internal;
+      return warn_sys("(fdout = scratchfile()) == -1");
 
     if (path != 0) {
       if (lseek(fd, 0, SEEK_SET) != 0)
-	return &resp_internal;
+	return warn_sys("lseek(fd, 0, SEEK_SET) != 0");
       if ((sock = try_connect_unix(path, connect_timeout)) >= 0)
 	if (scanit(fd, fdout, sock, &st)) {
 	  return (reject_spam && isspam)
@@ -189,7 +203,7 @@
       for (i = 0; i < ip_count; ++i) {
 	const ipv4addr* addr = &ips[(i + offset) % ip_count];
 	if (lseek(fd, 0, SEEK_SET) != 0)
-	  return &resp_internal;
+	  return warn_sys("lseek(fd, 0, SEEK_SET) != 0");
 	if ((sock = try_connect(addr, port, connect_timeout)) < 0)
 	  continue;
 	if (scanit(fd, fdout, sock, &st)) {
@@ -200,7 +214,10 @@
       }
     }
   }
-  return &resp_no_scan;
+  if (failsafe > 0)
+    return warn_sys("Could not SpamAssassin scan message");
+  else
+    return &resp_no_scan;
 }
 
 struct plugin plugin = {
--- mailfront-1.16/plugin-spamassassin.html.original	2010-04-07 20:25:40.000000000 +0800
+++ mailfront-1.16/plugin-spamassassin.html	2010-04-07 20:26:35.000000000 +0800
@@ -21,6 +21,12 @@
 
 <dl>
 
+<dt><tt>$SPAMD_FAILSAFE</tt></dt>
+<dd>The default behaviour of the plugin is to defer any SMTP delivery if the
+SpamAssassin scanner is not available, at the risk of emails being finally rejected if
+the problem is not fixed. To let any mail pass in such a case set this variable
+to a numerical value greater than 0.</dd>
+
 <dt><tt>$SPAMD_CONNECT_TIMEOUT</tt></dt> <dd>The maximum amount of time
 to wait for a response when connecting to a SpamAssassin scanner, in
 milliseconds. (defaults to $SPAMD_TIMEOUT below)</dd>