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

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

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

Modified Files:
	spamd.raw 
Log Message:
more in line with NMAP standards

Index: spamd.raw
===================================================================
RCS file: /cvsroot/netmail/netmail/spamd.raw,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- spamd.raw	8 Jul 2004 06:28:08 -0000	1.4
+++ spamd.raw	25 Jul 2004 16:34:08 -0000	1.5
@@ -271,7 +271,7 @@
                                   Listen    => SOMAXCONN
 ) || die "Could not create INET socket: $! $@\n";
 my $listen = $server->sockport;
-print $nmap "QWAIT 4 $listen SpamAssassin\n";
+print $nmap "QWAIT 1 $listen SpamAssassin\n";
 die "Failed to register with queue" if $nmap->getline !~ /^1000 /;
 $nmap->close;
 
@@ -476,7 +476,7 @@
     my @envelope;
     while ($_ = $client->getline) {
         last if /^6021 /;
-        if (/^SpamAssassin/ || /^F- -/) {
+        if (/^spamAssassin/ || /^F- -/) {
             until ($client->getline =~ /^6021 /) {};
             print $client "QDONE\n";
             $_ = $client->getline;
@@ -566,7 +566,7 @@
                     return 1;
                 }
             }
-            print $client "QSTOR RAW SpamAssassin\n";
+            print $client "QSTOR RAW spamAssassin\n";
             unless (/^1000 /) {
                 protocol_error ($_);
                 return 1;