Fixed the spam-block code.

svn path=/trunk/; revision=2030

diff --git a/NEWS b/NEWS
index 6da0aa8b0f163619fe2c7f46daf359ab89ee45c1..e21b0f60247f15d4a7902805c4dae687c6676993 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,12 @@
                                Release Notes:
 
-fetchmail-4.5.4 ():
+fetchmail-4.5.5 ():
 * Brendan Cully's FAQ entry on GSSAPI.
 * Andrew Cagney's improvement to Received-line parsing.
+* Kent Robotti sent an updated version of fetchsetup.
+* Fixed the spam-block code that I broke in 4.5.3 :-(.
 
-There are 260 people on fetchmail-friends and 251 on fetchmail-announce.
+There are 260 people on fetchmail-friends and 252 on fetchmail-announce.
 
 fetchmail-4.5.4 (Sat Jul 25 10:25:14 EDT 1998):
 * Fixed processing of --antispam option.

diff --git a/driver.c b/driver.c
index 6abe5c48e29cb5cc304454cd4a0f0367a0b7375c..2ed48634b79d063a2cdd2da362b63766d42511ce 100644 (file)
--- a/driver.c
+++ b/driver.c
@@ -1210,9 +1210,10 @@ int num;         /* index of message */
                 * try to ship the message, and don't prevent it from
                 * being deleted.  Typical values:
                 *
-                * 571 = sendmail's "unsolicited email refused"
                 * 501 = exim's old antispam response
                 * 550 = exim's new antispam response (temporary)
+                * 553 = sendmail 8.8.7's generic REJECT 
+                * 571 = sendmail's "unsolicited email refused"
                 *
                 * We don't send bouncemail on antispam failures because
                 * we don't want the scumbags to know the address is even

diff --git a/fetchmail.c b/fetchmail.c
index a9d52ac88bc96f7a51a779d63729372fdd577501..1d549eb5209214f0c3120735c8ca16df8748688b 100644 (file)
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -741,9 +741,9 @@ static int load_params(int argc, char **argv, int optind)
     memset(&def_opts, '\0', sizeof(struct query));
     def_opts.smtp_socket = -1;
     def_opts.smtpaddress = (char *)0;
-    save_str(&def_opts.antispam, (char *)NULL, 0)->val.status.num = 571;
-    save_str(&def_opts.antispam, (char *)NULL, 0)->val.status.num = 550;
-    save_str(&def_opts.antispam, (char *)NULL, 0)->val.status.num = 501;
+    save_str(&def_opts.antispam, STRING_DUMMY, 0)->val.status.num = 571;
+    save_str(&def_opts.antispam, STRING_DUMMY, 0)->val.status.num = 550;
+    save_str(&def_opts.antispam, STRING_DUMMY, 0)->val.status.num = 501;
 
     def_opts.server.protocol = P_AUTO;
     def_opts.server.timeout = CLIENT_TIMEOUT;

diff --git a/fetchmail.h b/fetchmail.h
index acbf14fc6d89fdeb8a7130bc4da47675a5c8343f..c4ce591deb7f7af5e15eaaa92120af5b9fe764b5 100644 (file)
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -400,5 +400,6 @@ void itimerthread(void*);
 #endif
 
 #define STRING_DISABLED        (char *)-1
+#define STRING_DUMMY   ""
 
 /* fetchmail.h ends here */

diff --git a/rcfile_y.y b/rcfile_y.y
index d3af58b36aaa912bdbac1e715a8155d28ecb0714..d03820b3bd8474a4175d07a8e3d29f65053387e1 100644 (file)
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -261,16 +261,18 @@ smtp_list : STRING                {save_str(&current.smtphunt, $1,TRUE);}
                | smtp_list STRING      {save_str(&current.smtphunt, $2,TRUE);}
                ;
 
-num_list       : NUMBER                {
-                                           struct idlist *id;
-                                           id=save_str(&current.antispam,0,0);
-                                           id->val.status.num = $1;
-                                       }
-               | num_list NUMBER       {
-                                           struct idlist *id;
-                                           id=save_str(&current.antispam,0,0);
-                                           id->val.status.num = $2;
-                                       }
+num_list       : NUMBER
+                       {
+                           struct idlist *id;
+                           id=save_str(&current.antispam,STRING_DUMMY,0);
+                           id->val.status.num = $1;
+                       }
+               | num_list NUMBER
+                       {
+                           struct idlist *id;
+                           id=save_str(&current.antispam,STRING_DUMMY,0);
+                           id->val.status.num = $2;
+                       }
                ;
 
 user_option    : TO localnames HERE