DATA part is properly sent to remote MX (mailref and mailpostg)

diff --git a/data-feed/feed02.tst b/data-feed/feed02.tst
index 278a247602d638bc0a0ae88aaa33c91d041c3425..d67c865daf63cb7401beece8b00efccf36457f4d 100644 (file)
--- a/data-feed/feed02.tst
+++ b/data-feed/feed02.tst
@@ -22,7 +22,7 @@ D:Subject: Very Simple email contents 2 domains
 D:From: Maitre Post <postmaster@example.com>
 D:To: Maitre WEB <webmaster@example.com>
 D:
-D:.single dot, next is an empty line starting with a '..
+D:.single dot, next is an empty line starting with a '.'
 D:.
 D:This email is sent to 2 domain X 2 users
 D:

diff --git a/lib/gestcp.c b/lib/gestcp.c
index e0ba50515f0a205f66141051a4723ef1f8847fa8..30095fc48cf9b3c039c5f35ae6d80219b0c20262 100644 (file)
--- a/lib/gestcp.c
+++ b/lib/gestcp.c
@@ -134,6 +134,7 @@ if (socptr!=(SOCPTR *)0) {
   taille=strlen(buffer);
   if (taille>0) 
     sent=soc_writebuffer(socptr,buffer,taille);
+  //(void) rou_alert(0,"tcp_write,JMPDBG <%s>",buffer);
   }
 return sent;
 }
@@ -226,7 +227,7 @@ PUBLIC int tcp_send_smtp_data(RMTTYP *rmt,const char *qemail)
 
 {
 #define OPEP    "gestcpc.c:tcp_send_smtp_data,"
-#define ENDDATA CRLF"."CRLF
+#define ENDDATA "."CRLF
 
 int sent;
 FILE *qfile;
@@ -267,7 +268,7 @@ while (proceed==true) {
         while (strlen(data)>0);
         //dot escape
         if ((strlen(data)>0)&&(data[0]=='.'))
-          (void) memmove(data,data+1,strlen(data+1));
+          (void) memmove(data+1,data,strlen(data));
         (void) strcat(data,CRLF);
         sent+=tcp_write(rmt->socptr,data);
         }