Removing the discard status

diff --git a/lib/lvleml.c b/lib/lvleml.c
index 2c9fbc1ef1d5b1b1a9e0f9646dc348aa01da2783..97085e7c0dab3e2cbefd51031d6cb75df21f8157 100644 (file)
--- a/lib/lvleml.c
+++ b/lib/lvleml.c
@@ -800,7 +800,7 @@ while (proceed==true) {
       if ((buffer==(char *)0)||(strlen(buffer)==0)) {
         const char *ninfo="%d 5.7.1 Missing auth type";
 
-        (void) eml_note(contact,NULL,ninfo,DISCARD);
+        (void) eml_note(contact,NULL,ninfo,UKNUSER);
         (void) eml_transmit(contact,true,ninfo,UKNUSER);
         phase=999;      //No need to go further 
         }
@@ -822,7 +822,7 @@ while (proceed==true) {
         static char *cmt="bad authentication type";
 
         (void) rou_alert(0,"%s auth type <%s> unknown (Bug?)",OPEP,local);
-        (void) eml_note(contact,NULL,"%d %s",DISCARD,cmt);
+        (void) eml_note(contact,NULL,"%d %s",BADPAR,cmt);
         (void) eml_transmit(contact,true,"%d 5.7.2 %s",BADPAR,cmt);
         (void) setterminator(contact,cmt);
         phase=999;      //Trouble Trouble
@@ -837,7 +837,7 @@ while (proceed==true) {
             static char *cmt="Unsafe PLAIN auth mode";
 
             contact->credit-=2;
-            (void) eml_note(contact,NULL,"%d %s",DISCARD,cmt);
+            (void) eml_note(contact,NULL,"%d %s",FAILED,cmt);
             (void) eml_transmit(contact,true,"%d 5.7.3 %s",FAILED,cmt);
             (void) setterminator(contact,cmt);
             phase=999;
@@ -850,7 +850,7 @@ while (proceed==true) {
             static char *cmt="Unsafe LOGIN auth mode";
 
             contact->credit-=2;
-            (void) eml_note(contact,NULL,"%d %s",DISCARD,cmt);
+            (void) eml_note(contact,NULL,"%d %s",FAILED,cmt);
             (void) eml_transmit(contact,true,"%d 5.7.3 %s",FAILED,cmt);
             (void) setterminator(contact,cmt);
             phase=999;
@@ -883,7 +883,7 @@ while (proceed==true) {
         (void) log_fprintlog(contact->logptr,true,fmt,BADAUTH,auth,rmtpass);
         (void) sleep(2);
         (void) eml_note(contact,NULL,"%d user <%s> pass=<%s> bad authentication",
-                                      DISCARD,auth,rmtpass);
+                                      BADAUTH,auth,rmtpass);
         (void) eml_transmit(contact,true,"%d 5.7.4 wrong authentication",BADAUTH);
         (void) setterminator(contact,"Authentication failure");
         contact->credit-=1;

diff --git a/lib/modrec.c b/lib/modrec.c
index d8b5a02f435c1cd54f3d171f062e4f3dcf37f393..dfc5f7e2e3817e7d2f3027127fab6f634f1fdd06 100644 (file)
--- a/lib/modrec.c
+++ b/lib/modrec.c
@@ -211,7 +211,7 @@ while (proceed==true) {
           contact->credit=-1;
           (void) sleep(2);
           (void) eml_note(contact,NULL,"%d remote server, credit (%d) is too low",
-                                        DISCARD,srv->credit);
+                                        DATRJC,srv->credit);
           (void) eml_transmit(contact,true,"%d 6.6.6 %s",DATRJC,cmt);
           phase=999;    //rejecting remote first hand
           }

diff --git a/lib/unieml.h b/lib/unieml.h
index 428d8cda74ed79c0307807eaf926f43354967f4a..45623e99abbd61d3c819f3e65f11e1cbc707c113 100644 (file)
--- a/lib/unieml.h
+++ b/lib/unieml.h
@@ -43,7 +43,6 @@
 #define NORELAY 555             //we do not relay email
 #define BLCKLST 556             //remote site Black listed 
 #define MISSMX  563             //NO MX found for recipient
-#define DISCARD 999             //Internal code to post comment via note
 
 //defining extensions
 #define EXTODO  "todo"          //todo qfile extension