Trapping remote probleme

diff --git a/data-feed/feed006.tst b/data-feed/feed006.tst
index 47bd2c838e198a611066685b9002c748fb9c5165..97a8a86414c6388d815e10f599a56b28cbecef9b 100644 (file)
--- a/data-feed/feed006.tst
+++ b/data-feed/feed006.tst
@@ -2,11 +2,11 @@ T:(feed006) Email testing BAD remote server credential in case of authentication
 C:CONNECT
 #====================================================
 R:220 mailleur.example.com, ESMTP (cleartext) mailleur...
-C:ORGN: 213.209.157.107
+C:ORGN: 213.209.157.108
 R:220 mailleur.example.com, ESMTP (cleartext) mailleur...
 C:GOTLS
 S:EHLO example.com
-R:250-mailleur.example.com, link (crypted) ready, your IP/FQDN=[213.209.157.107/No.Reverse]
+R:250-mailleur.example.com, link (crypted) ready, your IP/FQDN=[213.209.157.108/No.Reverse]
 R:250-AUTH PLAIN LOGIN DIGEST-MD5
 R:250-SIZE 52428800
 R:250-8BITMIME

diff --git a/lib/lvleml.c b/lib/lvleml.c
index cc1234526d0f2f6076ea5573667df837f2f752be..f8196afd88c197733ebaf4db38e9701a5e04ebc3 100644 (file)
--- a/lib/lvleml.c
+++ b/lib/lvleml.c
@@ -1045,9 +1045,12 @@ while (proceed==true) {
       break;
     default     :       //SAFE Guard
       if (remotegood==false) {
+        char *rcptto;
 
-        (void) eml_transmit(contact,true,"%d 2.8.0 %s for domain <%s>",
-                                         NORELAY,cmt,rmtusr->domain);
+        (void) rou_asprintf(&rcptto,"%s@%s",rmtusr->userid,rmtusr->domain);
+        (void) note_rcpt(contact,rcptto,NORELAY,"2.8.0 %s for domain <%s>",
+                                                 cmt,rmtusr->domain);
+        rcptto=rou_freestr(rcptto);
         }
       proceed=false;
       break;

diff --git a/sql/datatest.sql b/sql/datatest.sql
index 6fc23a919207ee67cfee168daecd992bf10d876c..4ff95c682b6a9eaea074ab2e8031398dcb39795f 100644 (file)
--- a/sql/datatest.sql
+++ b/sql/datatest.sql
@@ -48,6 +48,8 @@ INSERT INTO remotes (remoteip,credit,lastscan)                        \
          values ('45.197.14.139',-5,now());
 INSERT INTO remotes (remoteip,credit,lastscan)                 \
          values ('213.209.157.107',-5,now()+ADDTIME(200 day));
+INSERT INTO remotes (remoteip,credit,lastscan)                 \
+         values ('213.209.157.108',-5,now());
 INSERT INTO remotes (remoteip,credit,lastscan)                 \
          values ('122.175.193.134',-5,now());
 INSERT INTO remotes (remoteip,credit,lastscan)                 \

diff --git a/www/lvlmai.php b/www/lvlmai.php
index 4205f2b44cb91c0255dcc51bc35b87a5fcbf6d68..56c52c19eed13d959493ca2c20e90b83f4a91f58 100644 (file)
--- a/www/lvlmai.php
+++ b/www/lvlmai.php
@@ -51,7 +51,7 @@ foreach($actions as $action) {
   $emailfrom=htmlspecialchars($action['emailfrom'],ENT_QUOTES);
   $subject=$action['subject'];
   if (($subject==NULL) || (strlen($subject)==0)) 
-    $subject=$action['info'];
+    $subject=htmlspecialchars($action['info'],ENT_QUOTES);
   //generating the table contents
   $line=$line."<TR>\r\n";
   $line=$line."<TD align=left>$count $status</TD>\r\n";