19c19
< static char id[] = "@(#)$Id: queue.c,v 8.343.4.55 2001/05/03 23:37:11 gshapiro Exp $ (with queueing)";
---
> static char id[] = "@(#)$Id: queue.c,v 8.343.4.62 2001/07/20 00:53:01 gshapiro Exp $ (with queueing)";
21c21
< static char id[] = "@(#)$Id: queue.c,v 8.343.4.55 2001/05/03 23:37:11 gshapiro Exp $ (without queueing)";
---
> static char id[] = "@(#)$Id: queue.c,v 8.343.4.62 2001/07/20 00:53:01 gshapiro Exp $ (without queueing)";
70a71,99
> /*
> ** Current qf file field assignments:
> **
> ** A AUTH= parameter
> ** B body type
> ** C controlling user
> ** D data file name
> ** E error recipient
> ** F flag bits
> ** G queue delay algorithm
> ** H header
> ** I data file's inode number
> ** K time of last delivery attempt
> ** L Solaris Content-Length: header (obsolete)
> ** M message (obsolete)
> ** N number of delivery attempts
> ** P message priority
> ** Q original recipient (ORCPT=)
> ** R recipient
> ** S sender
> ** T init time
> ** V queue file version
> ** X character set (_FFR_SAVE_CHARSET)
> ** Y current delay
> ** Z original envelope id from ESMTP
> ** $ define macro
> ** . terminate file
> */
>
376a406
>
2154c2184
< case 'K': /* time of last delivery attempt */
---
> case 'K': /* time of last delivery attempt */
2159c2189
< case 'G': /* queue delay algorithm */
---
> case 'G': /* queue delay algorithm */
2162c2192
< case 'Y': /* current delay */
---
> case 'Y': /* current delay */
2935a2966,2968
> {
> char *o;
>
2936a2970,2974
>
> /* if there is another ':': restore it */
> if ((o = strtok(NULL, ":")) != NULL && o > p)
> o[-1] = ':';
> }
3089c3127
< if (NumQueues == 1)
---
> if (NumQueues <= 1)