diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2001-02-28 00:19:57 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2001-02-28 00:19:57 +0000 |
| commit | e4882e48c06ee9963c8275992cd9767a29e01c05 (patch) | |
| tree | 931d99d3910ebafc6a747029ff208f01292f5d8b /contrib/sendmail/src/queue.c | |
| parent | 2143eb84286d79cdfaa711372954774a827fee31 (diff) | |
| parent | 8d82727087db5182be90a20f20175cc720c5d1e5 (diff) | |
| download | FreeBSD-src-e4882e48c06ee9963c8275992cd9767a29e01c05.zip FreeBSD-src-e4882e48c06ee9963c8275992cd9767a29e01c05.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r73188,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/sendmail/src/queue.c')
| -rw-r--r-- | contrib/sendmail/src/queue.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/contrib/sendmail/src/queue.c b/contrib/sendmail/src/queue.c index 590aed9..f94498e 100644 --- a/contrib/sendmail/src/queue.c +++ b/contrib/sendmail/src/queue.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. * Copyright (c) 1988, 1993 @@ -16,9 +16,9 @@ #ifndef lint # if QUEUE -static char id[] = "@(#)$Id: queue.c,v 8.343.4.38 2000/12/08 14:33:02 ca Exp $ (with queueing)"; +static char id[] = "@(#)$Id: queue.c,v 8.343.4.44 2001/02/22 00:55:35 ca Exp $ (with queueing)"; # else /* QUEUE */ -static char id[] = "@(#)$Id: queue.c,v 8.343.4.38 2000/12/08 14:33:02 ca Exp $ (without queueing)"; +static char id[] = "@(#)$Id: queue.c,v 8.343.4.44 2001/02/22 00:55:35 ca Exp $ (without queueing)"; # endif /* QUEUE */ #endif /* ! lint */ @@ -835,6 +835,7 @@ run_single_queue(queuedir, forkflag, verbose) CurEnv = &QueueEnvelope; e = newenvelope(&QueueEnvelope, CurEnv); e->e_flags = BlankEnvelope.e_flags; + e->e_parent = NULL; /* make sure we have disconnected from parent */ if (forkflag) @@ -1558,7 +1559,7 @@ workcmpf1(a, b) return b->w_lock - a->w_lock; /* job priority */ - return a->w_pri - b->w_pri; + return workcmpf0(a, b); } /* ** WORKCMPF2 -- second compare function for ordering work based on host name. @@ -1599,7 +1600,7 @@ workcmpf2(a, b) return i; /* job priority */ - return a->w_pri - b->w_pri; + return workcmpf0(a, b); } /* ** WORKCMPF3 -- simple submission-time-only compare function. |
