Ready for Rachel.

svn path=/trunk/; revision=602

4 files changed, 15 insertions, 41 deletions

diff --git a/Makefile.in b/Makefile.in
index 993337c1..238b7989 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,7 +4,7 @@
 # So just uncomment all the lines marked QNX.
 
 VERS=2.1
-PL=1
+PL=2
 
 # Ultrix 2.2 make doesn't expand the value of VPATH.
 srcdir = @srcdir@
diff --git a/NEWS b/NEWS
index b60e8df2..6cc9e12c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,18 @@
 			Release Notes:
 
+fetchmail-2.2 (Wed Dec  4 23:55:20 EST 1996):
+
+features --
+
+* If SMTP returns 571 (unsolicited mail refused) to a MAIL FROM, the
+  address is excluded by the local sendmail's spam filter.  Drop the mail.
+
+bugs --
+
+* Fixed a startup-time core dump introduced by 2.1's aka-list feature
+* Fixed a bug in non-implicit (poll specified host) mode also due to aka.
+* Various minor portability fixes for Suns.
+
 fetchmail-2.1 (Thu Nov 28 11:07:48 EST 1996):
 
 features --
diff --git a/smtp.c b/smtp.c
index ea75560c..1ef1183c 100644
--- a/smtp.c
+++ b/smtp.c
@@ -92,16 +92,7 @@ int SMTP_eom(FILE *sockfp)
   return ok;
 }
 
-void SMTP_rset(FILE *sockfp)
-/* send a "RSET" message to the SMTP listener */
-{
-  SockPrintf(sockfp,"RSET\r\n");
-  if (outlevel == O_VERBOSE)
-      fprintf(stderr, "SMTP> RSET\n");
-}
-
-
-static int SMTP_check(FILE *sockfp)
+int SMTP_ok(FILE *sockfp)
 /* returns status of SMTP connection */
 {
     int  n;
@@ -123,33 +114,4 @@ static int SMTP_check(FILE *sockfp)
     return SM_UNRECOVERABLE;
 }
 
-int SMTP_ok(FILE *sockfp)
-/* accepts SMTP response, returns status of SMTP connection */
-{
-  int  ok;  
-
-  /* I can tell that the SMTP server connection is ok if I can read a
-     status message that starts with "1xx" ,"2xx" or "3xx".
-     Therefore, it can't be ok if there's no data waiting to be read
-     
-     Tried to deal with this with a call to SockDataWaiting, but 
-     it failed badly.
-
-    */
-
-  ok = SMTP_check(sockfp);
-  if (ok == SM_ERROR) /* if we got an error, */
-    {
-      SMTP_rset(sockfp);
-      ok = SMTP_check(sockfp);  /* how does it look now ? */
-      if (ok == SM_OK)  
-	ok = SM_ERROR;                /* It's just a simple error, for*/
-				      /*	 the current message  */
-      else
-	ok = SM_UNRECOVERABLE;       /* if it still says error, we're */
-                                     /* in bad shape                  */ 
-    }
-  return ok;
-}
-
 /* smtp.c ends here */
diff --git a/smtp.h b/smtp.h
index d673ec93..cdcadd5a 100644
--- a/smtp.h
+++ b/smtp.h
@@ -21,6 +21,5 @@ int SMTP_data(FILE *sockfp);
 int SMTP_eom(FILE *sockfp);
 int SMTP_quit(FILE *sockfp);
 int SMTP_ok(FILE *sockfp);
-void SMTP_rset(FILE *sockfp);
 
 #endif