Adding 0 credit when credit is too low

diff --git a/Makefile.dbg b/Makefile.dbg
index 88be5ddd45e1249ded0b493cb5a5c3742665285d..d1842d439f7af385b0b1fd769cc981bb9ee59ad7 100644 (file)
--- a/Makefile.dbg
+++ b/Makefile.dbg
@@ -87,7 +87,8 @@ onefeed       :  debug
 
 onesendr:  debug
           @                                            \
-            ./bin/sender                               -f                                      \
+            ./bin/sender                               \
+                 -f                                    \
                  -d 2                                  \
                  -c ./conf/mailleur.conf.dvl           \
                 -r $(TESTDIR)                          \

diff --git a/data-feed/feed010.tst b/data-feed/feed010.tst
deleted file mode 100644 (file)
index 5d46aca..0000000
--- a/data-feed/feed010.tst
+++ /dev/null
@@ -1,9 +0,0 @@
-T:(feed010) Making sure we can reject a remote
-C:CONNECT
-#====================================================
-R:220 mailleur.example.com, ESMTP (cleartext) mailleur...
-#take a "invalide" imp number as server remote IP
-C:ORGN: 8.8.8.8.
-R:250 3.5.3 Message accepted for delivery
-S:QUIT
-R:221 2.0.0 Bye, closing connection...

diff --git a/data-feed/feedx10.tst b/data-feed/feedx10.tst
new file mode 100644 (file)
index 0000000..9d0928f
--- /dev/null
+++ b/data-feed/feedx10.tst
@@ -0,0 +1,5 @@
+T:(feedx10) Making sure we can reject a remote
+C:CONNECT
+#====================================================
+#take a "invalid" imp number as server remote IP
+R:521 7.0.0 Remote server credit too low

diff --git a/lib/geseml.c b/lib/geseml.c
index 5a7c01f582a8c5ebc9d90a7cd4b687300aa6ece3..82d1b473deed095ce87dd328fde380fd3a7a6a36 100644 (file)
--- a/lib/geseml.c
+++ b/lib/geseml.c
@@ -769,7 +769,7 @@ return result;
 */
 /********************************************************/
 /*                                                      */
-/*     Procedure to build a waring/reply about an      */
+/*     Procedure to build a warning/reply about an     */
 /*      unsuccessfull email sending. The Email is sent  */
 /*      back to the originator.                         */
 /*                                                      */

diff --git a/lib/lvleml.c b/lib/lvleml.c
index a3281028283975f32defb759924e481b9b10e66a..d433435869fca4642b9baf866c096e0f4d9e9d2d 100644 (file)
--- a/lib/lvleml.c
+++ b/lib/lvleml.c
@@ -115,7 +115,10 @@ if (contact!=(CONTYP *)0) {
   fin=0;
   (void) freesessid(contact);
   contact->logptr=log_closelog(contact->logptr,&debut,&fin);
-  (void) sql_addevent(contact->sqlptr,contact->mainsesid,debut,fin);
+  if (contact->mainsesid!=(char *)0) {
+    (void) sql_addevent(contact->sqlptr,contact->mainsesid,debut,fin);
+    contact->mainsesid=rou_freestr(contact->mainsesid);
+    }
   contact->sqlptr=sql_closesql(contact->sqlptr);
   contact->termend=rou_freestr(contact->termend);
   contact->relayok=(AFNTYP **)rou_freelist((void **)contact->relayok,
@@ -124,7 +127,6 @@ if (contact!=(CONTYP *)0) {
                                               (genfree_t)eml_freerecipient);
   contact->authname=rou_freestr(contact->authname);
   contact->mailfrom=rou_freestr(contact->mailfrom);
-  contact->mainsesid=rou_freestr(contact->mainsesid);
   contact->fqdn=rou_freestr(contact->fqdn);
   contact->peername=rou_freestr(contact->peername);
   contact->peerip=rou_freestr(contact->peerip);

diff --git a/lib/modrec.c b/lib/modrec.c
index 079f5d4799f1c588caf855caa2715cb6c98caf3e..b8fc43415eda22948057f968d2ee07b2c6384243 100644 (file)
--- a/lib/modrec.c
+++ b/lib/modrec.c
@@ -207,6 +207,7 @@ while (proceed==true) {
         if (srv->credit<=reject) {
           contact->termend=rou_freestr(contact->termend);
           contact->termend=strdup(cmt);
+          contact->credit=0;
           (void) eml_transmit(contact,true,"%d 7.0.0 %s",DATRJC,cmt);
           phase=999;    //rejecting remote first hand
           }

diff --git a/sql/datatest.sql b/sql/datatest.sql
index e5ffa4db10d62a7fc8577c504893b68ce5da74d7..ba678eb6672140a2331fdbaa619303d86eb5e02d 100644 (file)
--- a/sql/datatest.sql
+++ b/sql/datatest.sql
@@ -59,4 +59,4 @@ INSERT INTO remotes (remoteip)                                        \
 
 //selected IP with low credit
 INSERT INTO remotes (remoteip,credit)                          \
-         values ('8.8.8.8',-50);
+         values ('127.127.127.127',-50);