[Netmail-cvs] netmail spamd.raw,1.3,1.4

[Pascal <pas...@us...>]

Update of /cvsroot/netmail/netmail
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12947

Modified Files:
	spamd.raw 
Log Message:
ignore locally generated  messages (such as bounces)

Index: spamd.raw
===================================================================
RCS file: /cvsroot/netmail/netmail/spamd.raw,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- spamd.raw	24 Jun 2004 08:14:21 -0000	1.3
+++ spamd.raw	8 Jul 2004 06:28:08 -0000	1.4
@@ -476,7 +476,8 @@
     my @envelope;
     while ($_ = $client->getline) {
         last if /^6021 /;
-        if (/SpamAssassin/) {
+        if (/^SpamAssassin/ || /^F- -/) {
+            until ($client->getline =~ /^6021 /) {};
             print $client "QDONE\n";
             $_ = $client->getline;
             unless (/^1000 /) {
@@ -484,7 +485,7 @@
                 return 1;
             }
             $client->close;
-            return;
+            return 1;
         }
         push(@envelope, $_);
     }