From: Jean-Marc Pigeon Date: Fri, 28 Nov 2025 04:01:56 +0000 (-0500) Subject: Removing the discard status X-Git-Tag: tag-0.19~18 X-Git-Url: https://jmp-git.ovh.safe.ca/?a=commitdiff_plain;h=5bf7b240f792edfcd9ffc64c7bd08f4ced928b26;p=jmp%2Fmailleur Removing the discard status --- diff --git a/lib/lvleml.c b/lib/lvleml.c index 2c9fbc1..97085e7 100644 --- 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 d8b5a02..dfc5f7e 100644 --- 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 428d8cd..45623e9 100644 --- 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