Changeset 275 for trunk/src/sh_nmail.c

Timestamp:

Mar 10, 2010, 9:24:17 PM (15 years ago)

Author:

katerina

Message:

Fix for ticket #195 (broken immediate mailing of highest priority messages).

File:

• trunk/src/sh_nmail.c (modified) (4 diffs)

trunk/src/sh_nmail.c

@@ -108 +108 @@
 
       SH_MUTEX_LOCK_UNSAFE(mutex_listall);
-      if (0 == check_double(str, all_recipients, S_TRUE))
+      if (0 != check_double(str, all_recipients, S_TRUE))
         {
           new->isAlias    = 1;
@@ -207 +207 @@
               for (i = 0; i < nfields; ++i) {
                 if (0 == check_double(array[i],  all_recipients, S_TRUE))
-                  nflag = 1;
+                  nflag = 1; /* not in all_recipients --> bad */
               }
 
@@ -406 +406 @@
                */
               if (flagit && list->isAlias == 0)
-                list->send_mail = 1;
+                {
+                  list->send_mail = 1;
+                }
               list = list->all_next;
             }
@@ -518 +520 @@
           if (retval != 0)
             {
+              sh_error_handle (SH_ERR_ALL, FIL__, __LINE__, 
+                               retval, MSG_E_SUBGEN,
+                               _("could not mail immediately"),
+                               _("sh_nmail_msg") );
               sh_mail_pushstack(level, message, alias);
             }