feed00 -> feed04 successfull

diff --git a/Makefile.dbg b/Makefile.dbg
index 79dddfe28dd483a6566c213580257a0fd37e3b7e..22f294ea872ac3f61981e724fba60e80b50f981f 100644 (file)
--- a/Makefile.dbg
+++ b/Makefile.dbg
@@ -80,7 +80,7 @@ onesortr:  debug
 #--------------------------------------------------------------------
 #procedure to start all needed components to have
 #a full complete test
-actions        :  killall doprog newtest dosortr dorcvr
+actions        :  killall debug newtest dosortr dorcvr
 
 dosortr :  
           @  echo "Starting Sorter"

diff --git a/conf/mailleur.conf.dvl b/conf/mailleur.conf.dvl
index a3ecf24790515b0e4a3ec90d63fe2898b6b716f9..d2ca327fea96ac08edeab26c8abd7dc6f2d6c49c 100644 (file)
--- a/conf/mailleur.conf.dvl
+++ b/conf/mailleur.conf.dvl
@@ -35,7 +35,7 @@ CA_VERIFY_CLT=0       #to check PEER/server remote certificate
 #------------------------------------------------
 #Configured for Postgresql database
 #DB_TYPE can be either POSTGRESQL,MYSQL, default POSTGRESQL
-DB_TYPE=MYSQL
+DB_TYPE=POSTGRESQL
 DB_NAME=mailleur
 DB_HOST=localhost
 DB_PORT=5432

diff --git a/data-feed/feed02.tst b/data-feed/feed02.tst
index 9a0526aa01f5293817330d1df8c912cd0fe45305..e16fcfc48c9bbf6a5030c465a5f19d3d11231fe3 100644 (file)
--- a/data-feed/feed02.tst
+++ b/data-feed/feed02.tst
@@ -9,11 +9,10 @@ S:RCPT TO: <webmaster@example.com>
 R:250 2.6.4 Address accepted <webmaster@example.com>
 S:RCPT TO: <user1@mailref1.example.com>
 R:250 2.6.4 Address accepted <user1@mailref1.example.com>
-S:RCPT TO: <user1@mailleur.example.com>
-R:250 2.6.4 Address accepted <user1@posdb.example.com>
 S:RCPT TO: <user1@posdb.example.com>
-R:250 2.6.4 Address accepted <user2r1@mardb.example.com>
+R:250 2.6.4 Address accepted <user1@posdb.example.com>
 S:RCPT TO: <user1@mardb.example.com>
+R:250 2.6.4 Address accepted <user1@mardb.example.com>
 #-------------------------------------------------------------------------
 #-sending data
 C:DATA 354 3.5.0 End data with <CR><LF>.<CR><LF>
@@ -23,7 +22,7 @@ D:To: Maitre WEB <webmaster@example.com>
 D:
 D:.single dot, next is an empty line starting with a '.'
 D:.
-D:This email is sent to 2 domain X 2 users
+D:This email is sent to 3 domain X 1 users
 D:
 C:.
 #-------------------------------------------------------------------------

diff --git a/data-feed/feed04.tst b/data-feed/feed04.tst
index 8d3c0703a82cdcbd47eabad0f6a51b4b7ae941cd..3119e845b15f604dc8471eb49ded2cc2773d918d 100644 (file)
--- a/data-feed/feed04.tst
+++ b/data-feed/feed04.tst
@@ -1,35 +1,64 @@
-T:(feed02) Sending a very Simple Email to 2 domains
+T:(feed04) Sending two email within the same session
 R:220 mailleur.example.com, ESMTP (cleartext) mailleur...
-#====================================================
+#=========================================================================
 S:HELO example.com
 R:250 mailleur.example.com, link (cleartext) ready,...
-S:MAIL FROM: <postmaster@example.com>
-R:250 2.1.3 postmaster@example.com.. sender ok
-S:RCPT TO: <webmaster@example.com>
-R:250 2.6.4 Address accepted <webmaster@example.com>
+S:MAIL FROM: <trouble@mailref1.example.com>
+R:250 2.1.3 trouble@mailref1.example.com.. sender ok
 S:RCPT TO: <user1@mailref1.example.com>
 R:250 2.6.4 Address accepted <user1@mailref1.example.com>
-S:RCPT TO: <user1@mysqlmail.example.com>
-R:250 2.6.4 Address accepted <user1@mysqlmail.example.com>
-S:RCPT TO: <user2@mailref1.example.com>
-R:250 2.6.4 Address accepted <user2@mailref1.example.com>
-S:RCPT TO: <user2@mysqlmail.example.com>
-R:250 2.6.4 Address accepted <user2@mysqlmail.example.com>
+S:RCPT TO: <user1@posdb.example.com>
+R:250 2.6.4 Address accepted <user1@posdb.example.com>
+S:RCPT TO: <user2@posdb.example.com>
+R:250 2.6.4 Address accepted <user2@posdb.example.com>
+S:RCPT TO: <user1@mardb.example.com>
+R:250 2.6.4 Address accepted <user1@mardb.example.com>
 #-------------------------------------------------------------------------
 #-sending data
 C:DATA 354 3.5.0 End data with <CR><LF>.<CR><LF>
-D:Subject: Very Simple email contents 2 domains
-D:From: Maitre Post <postmaster@example.com>
-D:To: Maitre WEB <webmaster@example.com>
+D:Subject: feed03 email first part
+D:From: Tester <trouble@mailref1.example.com>
+D:To: A User1 <user1@mailref1.example.com>
+D:Cc:<user1@posdb.example.com>,<user2@posdb.example.com>,<user1@mardb.example.com>
 D:
-D:.single dot, next is an empty line starting with a '.'
-D:.
-D:This email is sent to 2 domain X 2 users
+D:This email was transmitted by feed04 first session
+C:.
+#-------------------------------------------------------------------------
+R:250-3.5.3 Session ID=<...
+R:250-3.5.3 data stream received:...
+R:250 3.5.3 Message accepted for delivery
+#=========================================================================
+#Testing Reset sequence
+S:RSET
+R:250-2.1.0 flushed session ...
+R:250 2.1.0 opening new session...
+#-------------------------------------------------------------------------
+S:HELO example.com
+R:250 mailleur.example.com, link (cleartext) ready,...
+S:MAIL FROM: <trouble@mailref1.example.com>
+R:250 2.1.3 trouble@mailref1.example.com.. sender ok
+S:RCPT TO: <user1@mailref1.example.com>
+R:250 2.6.4 Address accepted <user1@mailref1.example.com>
+S:RCPT TO: <user1@posdb.example.com>
+R:250 2.6.4 Address accepted <user1@posdb.example.com>
+S:RCPT TO: <user2@posdb.example.com>
+R:250 2.6.4 Address accepted <user2@posdb.example.com>
+S:RCPT TO: <user1@mardb.example.com>
+R:250 2.6.4 Address accepted <user1@mardb.example.com>
+#-------------------------------------------------------------------------
+#-sending data
+C:DATA 354 3.5.0 End data with <CR><LF>.<CR><LF>
+D:Subject: feed03 email second part
+D:From: Tester <trouble@mailref1.example.com>
+D:To: A User1 <user1@mailref1.example.com>
+D:Cc:<user1@posdb.example.com>,<user2@posdb.example.com>,<user1@mardb.example.com>
 D:
+D:This email was transmitted by feed04 second session
 C:.
 #-------------------------------------------------------------------------
 R:250-3.5.3 Session ID=<...
 R:250-3.5.3 data stream received:...
 R:250 3.5.3 Message accepted for delivery
+#=========================================================================
 S:QUIT
 R:221 2.0.0 Bye, closing connection...