Adjusted the termination log meesage

diff --git a/conf/mailleur.conf b/conf/mailleur.conf
index 901ed132a3b5803e2314b16fc08dedd262e332ef..10ccd0f873bd96e09f87af73f6d01925d0f50b4e 100644 (file)
--- a/conf/mailleur.conf
+++ b/conf/mailleur.conf
@@ -36,7 +36,7 @@ SMTPPORTS="|||5,smtps||465|3,smtp||587|2"
 #If certificate set via do_dns_tlsa.sh (letsencrypt)
 #CA_CERT_SRV="/etc/certbot/mailleur/mailleur-fullchain.pem"
 #CA_KEY_SRV="/etc/certbot/mailleur/mailleur-key.pem"
-#I certificate are self signedA (default installation)
+#If certificate are self signed (default installation)
 CA_CERT_SRV="/etc/pki/mailleur/mailleur-cert.pem"
 CA_KEY_SRV="/etc/pki/mailleur/mailleur-key.pem"
 CA_ROOT_SRV="/etc/pki/tls/make-ca/ca-bundle.crt"
@@ -46,7 +46,7 @@ CA_VERIFY_SRV=0       #to check PEER/client remote certificate
 #If certificate set via do_dns_tlsa.sh (letsencrypt)
 #CA_CERT_CLT="/etc/certbot/mailleur/mailleur-fullchain.pem"
 #CA_KEY_CLT="/etc/certbot/mailleur/mailleur-key.pem"
-#I certificate are self signedA (default installation)
+#If certificate are self signed (default installation)
 CA_CERT_CLT="/etc/pki/mailleur/mailleur-cert.pem"
 CA_KEY_CLT="/etc/pki/mailleur/mailleur-key.pem"
 CA_ROOT_CLT="/etc/pki/tls/make-ca/ca-bundle.crt"

diff --git a/lib/lvleml.c b/lib/lvleml.c
index a9ddf2cec67aec98dc85cfa92bd8d7568b6b84fb..b8af38172e100a5034e0d0d7f660efb31f9ecbb9 100644 (file)
--- a/lib/lvleml.c
+++ b/lib/lvleml.c
@@ -2427,8 +2427,8 @@ while (proceed==true) {
       break;
     case c_quit         :       //QUIT SMTP protocol
       contact->credits++;       //clean disconnect
-      (void) transmit(contact,true,"%d 2.0.0 Bye, closing connection CRD=%d,CNT=%s",
-                                    QUITOK,contact->credits,contact->mainsesid);
+      (void) transmit(contact,true,"%d 2.0.0 Bye, closing connection CNT=%s",
+                                    QUITOK,contact->mainsesid);
       status=1;                 //every thing fine
       proceed=false;
       break;

diff --git a/lib/modrec.c b/lib/modrec.c
index fe121beb907da11308d5f133e8ce828b58a67398..242b892b56ffa7e74e2b0079c7ce551de18e1b8a 100644 (file)
--- a/lib/modrec.c
+++ b/lib/modrec.c
@@ -163,14 +163,12 @@ static void docontact(SOCPTR *socptr,int pos)
 #define OPEP    "modrec.c:docontact"
 
 CONTYP *contact;
-int delta;
 int intstat;
 int phase;
 _Bool proceed;
 
 contact=(CONTYP *)0;
 intstat=0;
-delta=0;
 phase=0;
 proceed=true;
 while (proceed==true) {
@@ -186,14 +184,12 @@ while (proceed==true) {
                            contact->locname,contact->locserv);
       break;
     case 2      :       //check if remote link is acceptable
-      delta=1;
-      if (sql_newconnect(contact->sqlptr,contact->peerip,delta)==false) {
+      if (sql_newconnect(contact->sqlptr,contact->peerip,1)==false) {
+        contact->credits-=1;
         phase=999;      //connection rejected
         }
-      delta=0;
       break;
     case 3      :       //do contact
-      delta=-1;
       intstat=eml_docontact(contact);
       switch (intstat) {
         case  1 :       //command 'quit' recieved
@@ -216,7 +212,9 @@ while (proceed==true) {
       break;
     default     :       //SAFE guard
       if (contact!=(CONTYP *)0) {
-        (void) sql_newconnect(contact->sqlptr,contact->peerip,delta);
+        (void) log_fprintlog(contact->logptr,true,"   (%s, credit='%d')",
+                                             "Contact terminated",contact->credits);
+        (void) sql_newconnect(contact->sqlptr,contact->peerip,-1);
         contact=eml_dropcontact(contact);
         }
       proceed=false;