This commit was generated by cvs2svn to compensate for changes in r173340,

which included commits to RCS files with non-trunk default branches.

1 files changed, 12 insertions, 4 deletions

diff --git a/contrib/sendmail/src/queue.c b/contrib/sendmail/src/queue.c
index e0919d5..e80a035 100644
--- a/contrib/sendmail/src/queue.c
+++ b/contrib/sendmail/src/queue.c
@@ -14,7 +14,7 @@
 #include <sendmail.h>
 #include <sm/sem.h>
 
-SM_RCSID("@(#)$Id: queue.c,v 8.972 2007/03/29 22:55:17 ca Exp $")
+SM_RCSID("@(#)$Id: queue.c,v 8.975 2007/06/18 20:08:40 ca Exp $")
 
 #include <dirent.h>
 
@@ -427,7 +427,7 @@ queueup(e, announce, msync)
 						break;
 					if (LogLevel > 0 && (i % 32) == 0)
 						sm_syslog(LOG_ALERT, e->e_id,
-							  "queueup: cannot create %s, uid=%d: %s",
+							  "queueup: cannot create %s, euid=%d: %s",
 							  tf, (int) geteuid(),
 							  sm_errstring(errno));
 				}
@@ -845,8 +845,8 @@ queueup(e, announce, msync)
 
 			if (bitset(H_FROM, h->h_flags))
 				oldstyle = false;
-
-			commaize(h, h->h_value, oldstyle, &mcibuf, e);
+			commaize(h, h->h_value, oldstyle, &mcibuf, e,
+				 PXLF_HEADER);
 
 			TrafficLogFile = savetrace;
 		}
@@ -2147,6 +2147,14 @@ run_work_group(wgrp, flags)
 
 		maxrunners = Queue[qgrp]->qg_maxqrun;
 
+		/*
+		**  If no runners are configured for this group but
+		**  the queue is "forced" then lets use 1 runner.
+		*/
+
+		if (maxrunners == 0 && bitset(RWG_FORCE, flags))
+			maxrunners = 1;
+
 		/* No need to have more runners then there are jobs */
 		if (maxrunners > njobs)
 			maxrunners = njobs;