Checking about the "purge" TLS timing

diff --git a/Makefile b/Makefile
index d24bc7948345b3adaaca90aa88985d2ce011582d..0c2a341e9f4d4d9b234b74feb165ce2daa2b9845 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,8 @@ tlsrcvr       :
                        -cert certs/localhost-cert.pem  \
                        -key certs/localhost-key.pem    \
                        -starttls smtp                  \
-                       -connect mailpostg.example.com:25
+                       -connect $(TESTSRV):$(TESTPORT) 
+#                      -connect mailpostg.example.com:25
 
 go465  :
                @ clear
@@ -112,7 +113,6 @@ go465       :
 #                      -showcerts                      
 #                      -tls1_2
 #                      -connect mailpostg.example.com:25
-#                      -connect mailprod1.safe.ca:25
 #                      -connect $(TESTSRV):$(TESTPORT) 
 #                      -connect smtp.google.com:25
 #                      -connect courriel.colba.net:25
@@ -121,11 +121,13 @@ go465     :
 tlsref:        
                @ clear
                @ openssl s_client                      \
-                       -msg                            \
+                       -status                         \
                        -CAfile certs/root-safe_CA.pem  \
                        -cert certs/localhost-cert.pem  \
                        -key certs/localhost-key.pem    \
+                       -starttls smtp                  \
                        -connect smtp.google.com:25
+
 #--------------------------------------------------------------------
 #starting email receiver
 

diff --git a/conf/mailleur.conf.dvl b/conf/mailleur.conf.dvl
index 2af37e6bf47f9613154b4b571def92efe64503fd..c3b73cb6abb65e33f03bdcf2dea325eae8b6f149 100644 (file)
--- a/conf/mailleur.conf.dvl
+++ b/conf/mailleur.conf.dvl
@@ -21,7 +21,7 @@ DFLTDOMAIN    =       "example.com"
 CA_ROOT_SRV    =       "./certs/root-safe_CA.pem"
 CA_CERT_SRV    =       "./certs/mailleur_server-chain-cert_x509.pem"
 CA_KEY_SRV     =       "./certs/mailleur_server-key.pem"
-CA_VERIFY_SRV  =       1       #to check PEER/client remote certificate
+CA_VERIFY_SRV  =       0       #to check PEER/client remote certificate
 #------------------------------------------------
 #Defining CLIENT mode Certificate data
 CA_ROOT_CLT    =       "./certs/root-safe_CA.pem"

diff --git a/lib/devsoc.c b/lib/devsoc.c
index d2073bfab31e30467ecdeab4aa661873bcfa071a..b54a842e1a7cac8b4792a30d11c3c55ac0958277 100644 (file)
--- a/lib/devsoc.c
+++ b/lib/devsoc.c
@@ -66,6 +66,7 @@ int count;
 
 max=1000;       //purging for 1 seconde max;
 count=0;
+/*
 for (;count<max;count++) {
   soc->carin=0;
   soc->carpile[0]='\000';
@@ -74,6 +75,7 @@ for (;count<max;count++) {
   if (soc->carin==0)    //got no character
     break;
   }
+*/
 if (count>=max) //one second max!
   (void) rou_alert(0,"%s purge is too long with peer [%s]",OPEP,peerip);
 #undef  OPEP

diff --git a/lib/lvleml.c b/lib/lvleml.c
index 6ddae4a2d318eeb0aa45d4799bb979917d7c37bb..56ef932e3f0e8db10e439d1ea6160ad83b3ed5ac 100644 (file)
--- a/lib/lvleml.c
+++ b/lib/lvleml.c
@@ -592,8 +592,7 @@ static char *ehlostr[]= {
         "-STARTTLS",
         "-8BITMIME",
         "-ENHANCEDSTATUSCODES",
-        "-AUTH PLAIN LOGIN",
-        " HELP",
+        " AUTH PLAIN LOGIN",
         (char *)0
         };