]> SAFE projects GIT repository - jmp/mailleur/commitdiff
Crash about closetls fixed
authorJean-Marc Pigeon (Delson) <jmp@safe.ca>
Wed, 11 Jun 2025 12:38:59 +0000 (08:38 -0400)
committerJean-Marc Pigeon (Delson) <jmp@safe.ca>
Wed, 11 Jun 2025 12:38:59 +0000 (08:38 -0400)
Makefile
conf/mailleur.conf.dvl
lib/devsoc.c
lib/subrou.c

index c00687cdb37f5d6c67cfcdc9af8daf1dbd8dc8af..e3cead7e2d13e7553db27457e0ee27191736cbd2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -210,7 +210,7 @@ go465       :
                        -crlf                           \
                        --showcerts                     \
                        -key certs/localhost-key.pem    \
-                       -cert certs/localhost-cert.pem  \
+                       -cert_chain certs/localhost-chain-cert.pem      \
                        -CAfile certs/root-safe_CA.pem  \
                        -tls1_2                         \
                        -connect $(TESTIP):1065
index 3e65d8e2d8b586645526b61c43e5278565c3b624..9e7af639cc639751b30c2e5a017998737b95a7e2 100644 (file)
@@ -11,7 +11,8 @@
 #::                    -> smtp:0.0.0.0:25:2
 #SMTPPORTS     "       "::"
 #SMTPPORTS     =       ":127.127.10.25:1025:,smtps:127.127.10.25:1026:1"
-SMTPPORTS      =       ":127.127.10.25:1025:"
+#SMTPPORTS     =       ":127.127.10.25:1025:"
+SMTPPORTS      =       "smtps:127.127.10.25:1065:1"
 #------------------------------------------------
 #Defining SERVER mode Certificate data
 CA_ROOT_SRV    =       "./certs/root-safe_CA.pem"
index 47ee9469088dba6e483c54b30447b606bb3997cb..a3ba5e5b57127e72834bc8568a698679afb85433 100644 (file)
@@ -1435,7 +1435,10 @@ while (proceed==true) {
             }
           break;
         case pro_smtps          :       //set secure socket
-          soc->tls=tls_closetls(soc->tls);
+          if (soc->modtls==true) {
+            soc->tls=tls_closetls(soc->tls);
+            soc->modtls=false;
+            }
           break;
         default                 :
           (void) rou_alert(0,"%s Protocol '%d' unset (Bug?)",
index cb5777f4b3f194e938b0a504bd79e0d33b4a993f..78d86b48fb0fa68b7f9c96e91a31c01882efcc85 100644 (file)
@@ -613,8 +613,9 @@ while (proceed==true) {
   }
 (void) sleep(COREDELAY);       /*to avoid crash avalanche      */
 va_end(args);
-if (doabort==true) 
+if (doabort==true) {
   (void) abort();      /*doing to do the abort         */
+  }
 (void) rou_alert(0,"Unable to dump core memory");
 (void) exit(-1);       //Theoriticaly unreachabe if
                         //abort was allowed