Changeset 214 for trunk/src/sh_forward.c

Timestamp:

Feb 17, 2009, 10:54:26 PM (16 years ago)

Author:

katerina

Message:

Rewrite mail subsystem for more flexibility (closes ticket #141).

File:

• trunk/src/sh_forward.c (modified) (5 diffs)

trunk/src/sh_forward.c

@@ -131 +131 @@
 #include "sh_entropy.h"
 #include "sh_html.h"
-#include "sh_mail.h"
+#include "sh_nmail.h"
 #include "sh_socket.h"
 #define SH_NEED_GETHOSTBYXXX
@@ -791 +791 @@
       if (status != 0)
         {
-          (void) push_tail_list (fifo, popmsg); 
+          (void) push_tail_list (fifo, popmsg, 0, NULL); 
           SH_FREE(popmsg);
-          if (SH_FIFO_MAX == push_list (fifo, errmsg))
+          if (SH_FIFO_MAX == push_list (fifo, errmsg, 0,NULL))
             {
               SL_RETURN (-2, _("sh_forward"));
@@ -812 +812 @@
                          sh.srvexport.name);
       failed = BAD;
-      if (SH_FIFO_MAX == push_list (fifo, errmsg))    /* push message on stack */
+      if (SH_FIFO_MAX == push_list (fifo, errmsg, 0, NULL))/* push on stack */
         {
           SL_RETURN (-2, _("sh_forward"));
@@ -5062 +5062 @@
             sh_forward_mark_dead ();
 
-#if defined(SH_WITH_MAIL)
-            reset_count_dev_mail();
-#endif
             reset_count_dev_console();
             reset_count_dev_time();
@@ -5284 +5281 @@
         {
           TPT((0, FIL__, __LINE__, _("msg=<Flush mail queue.>\n")))
-          (void) sh_mail_msg (NULL);
+          (void) sh_nmail_flush ();
           sh.mailTime.alarm_last = tcurrent;
         }