Valgrind no memory leak

diff --git a/Makefile b/Makefile
index 190375a6386c1dc88052a368a5f86a6a573c99b3..ffca5f7b841065a73e0efc3e6cde6be9ece58002 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -155,14 +155,15 @@ eml465    :  prepare
                -d 1                                    \
                smtps:$(TESTIP):1065:1
 
+VALKIND        = "definite,possible,indirect"
 valrcvr        :  prepare                      #valgring of emlrcvr
           @ echo "emlrec valgrind test"
           @ valgrind                                   \
                --leak-check=full                       \
-               --show-leak-kinds=all                   \
+               --show-leak-kinds=$(VALKIND)            \
                 $(TESTDIR)/$(SBINDIR)/emlrcvr          \
                        -f                              \
-                       ssEMLPAR)
+                       $(EMLPAR)
             
 #              --track-fds=yes                         \
 #              --track-origins=yes                     \

diff --git a/lib/modrec.c b/lib/modrec.c
index 19c765bc7edec39b86a68803e184b1e19e4e0674..8afa421951b1acd2c03740e7553abd15e674d421 100644 (file)
--- a/lib/modrec.c
+++ b/lib/modrec.c
@@ -189,6 +189,7 @@ iterations=soc_getiterations(socptr);
 phase=0;
 proceed=true;
 while (proceed==true) {
+  //(void) rou_alert(0,"%s JMPDBG phase='%d'",OPEP,phase);
   switch (phase) {
     case 0      :       //empty phase
       if (iterations>0) 
@@ -372,7 +373,7 @@ while (proceed==true) {
         }
       break;
     case 4      :       //relax time
-      if ((hangup==false)&&(reload==false))
+      if ((hangup==false)&&(reload==false)&&(foreground==false))
         phase=0;        //Normal process, lets restart
       else
         (void) usleep(10000);

diff --git a/lib/unieml.c b/lib/unieml.c
index e08be934ebe15235049f7cd864c020b2e80446c3..1a3fa0e57d475ecd21e2b371b261f80dfcd60240 100644 (file)
--- a/lib/unieml.c
+++ b/lib/unieml.c
@@ -90,15 +90,13 @@ CODTYP code;
 VOCTYP *ptr;
 
 code=c_unknown;
-//(void) rou_alert(0,"%s JMDPBG word=<%s>",OPEP,keyword);
 for (ptr=vocsmtp;ptr->code!=c_unknown;ptr++) {
   if (strncasecmp(ptr->key,keyword,strlen(ptr->key))==0) {
     char *par;
 
     code=ptr->code;
     par=keyword+strlen(ptr->key);
-    (void) strcpy(keyword,par);
-    //(void) rou_alert(0,"%s JMDPBG word now=<%s>",OPEP,keyword);
+    (void) memmove(keyword,par,strlen(par)+1);
     break;
     }
   }