Trying a full cyle to check warning email sending

diff --git a/Makefile b/Makefile
index e354d974bb3f54deeb8de384138fa69724b09398..ae31ac87bac14c0836e8b794ffd333cd7daf036b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,15 +39,15 @@ TESTITER=   1
 #--------------------------------------------------------------------
 #To test sorter
 dosorter:  
-          @ bin/sorter                                 \
+          @                                            \
+            bin/sorter                                 \
                   -d 2                                 \
                   -c ./conf/mailleur.conf.dvl          \
                   -r $(TESTDIR) 
 
 donesort:
-          @ gdb                                        \
-               --args                                  \
-           bin/sorter                                  \
+          @                                            \
+            bin/sorter                                 \
                   -f                                   \
                   -d 2                                 \
                   -c ./conf/mailleur.conf.dvl          \
@@ -98,6 +98,15 @@ dbgsorter:  clean debug
 
 #--------------------------------------------------------------------
 #To test sender
+onesend        :  clean debug
+          @                                            \
+            ./bin/sender                               \
+                 -d 2                                  \
+                 -c ./conf/mailleur.conf.dvl           \
+                -r $(TESTDIR)                          \
+                $(TESTDIR)/var/spool/$(APPNAME)/queue/*.todo
+          
+
 sender :  clean debug newtest
           @ rm -fr $(TESTDIR)/var/spool/$(APPNAME)/queue
           @ mkdir -p $(TESTDIR)/var/spool/$(APPNAME)/queue

diff --git a/lib/geseml.c b/lib/geseml.c
index 7f4cdacb69496d92643ef05e49f733b8df09ce95..2214a5ec665347947827147204c974b4627a1a81 100644 (file)
--- a/lib/geseml.c
+++ b/lib/geseml.c
@@ -779,7 +779,22 @@ proceed=true;
 while (proceed==true) {
   (void) rou_alert(0,"JMPDBG %s phase='%d'",OPEP,phase);
   switch (phase) {
-    case 0      :       //check if email is FROM local or remote
+    case 0      :       //getting the local originator
+      char dname[60];
+      char *ptr;
+
+      (void) memset(dname,'\000',sizeof(dname));
+      if (gethostname(dname,sizeof(dname))<0) {
+        (void) rou_alert(0,"%s Unable to get host name (error=<%s> bug?)",
+                              OPEP,strerror(errno));
+        phase=999;
+        }
+      if ((ptr=strchr(dname,'.'))!=(char *)0) {
+        ptr++;
+        (void) memcpy(dname,ptr,strlen(ptr)+1);
+        } 
+      break;
+    case 1      :       //check if email is FROM local or remote
       char *domain;
       int status;
 
@@ -804,18 +819,18 @@ while (proceed==true) {
           break;                
         }
       break;
-    case 1      :       //reversing originator/recipient
-      char dname[60];
+    case 2      :       //reversing originator/recipient
       char orig[100];
 
-      (void) memset(&dname,'\000',sizeof(dname));
-      (void) getdomainname(dname,sizeof(dname)); 
       (void) snprintf(orig,sizeof(orig),"%s@%s","noreply",dname);
       tra->rcptto=rou_freestr(tra->rcptto);
       tra->rcptto=tra->mailfrom;
       tra->mailfrom=strdup(orig);
       done=true;
       break;
+    case 3      :       //building the new sessid file
+      tra->resp=(char **)rou_freelist((void **)tra->resp,(genfree_t)rou_freestr);
+      break;
     default     :       //SAFE Guard
       proceed=false;
       break;