*** 5.41.0.11	1992/10/06 04:17:56
--- deliver.c	1993/11/10 16:47:43
***************
*** 1858,1863 ****
--- 1858,1864 ----
  		return;
  	}
  
+ 	QueueRun = FALSE;
  	for (q = e->e_sendqueue; q != NULL; q = q->q_next)
  	{
  		register ADDRESS *qq;
*** 5.22.0.28	1993/02/25 19:48:59
--- envelope.c	1993/11/10 16:48:31
***************
*** 122,127 ****
--- 122,129 ----
  	if (e->e_id == NULL)
  		return;
  
+ 	QueueRun = FALSE;
+ 
  	/*
  	**  Extract state information from dregs of send list.
  	**  Note that QBADADDR only counts as a failure if the
*** 5.15.0.29	1992/11/15 15:54:38
--- headers.c	1993/11/10 16:50:28
***************
*** 367,373 ****
  
  		/* send to this person if we so desire */
  		if (GrabTo && bitset(H_RCPT, h->h_flags) &&
! 		    !bitset(H_DEFAULT, h->h_flags) &&
  		    (!bitset(EF_RESENT, CurEnv->e_flags) || bitset(H_RESENT, h->h_flags)))
  		{
  			sendtolist(h->h_value, (ADDRESS *) NULL, &CurEnv->e_sendqueue);
--- 367,373 ----
  
  		/* send to this person if we so desire */
  		if (GrabTo && bitset(H_RCPT, h->h_flags) &&
! 		    !bitset(H_DEFAULT, h->h_flags) && !QueueRun &&
  		    (!bitset(EF_RESENT, CurEnv->e_flags) || bitset(H_RESENT, h->h_flags)))
  		{
  			sendtolist(h->h_value, (ADDRESS *) NULL, &CurEnv->e_sendqueue);
***************
*** 443,449 ****
  
  	/* errors to */
  	p = hvalue("errors-to");
! 	if (p != NULL)
  		sendtolist(p, (ADDRESS *) NULL, &e->e_errorqueue);
  
  	/* from person */
--- 443,449 ----
  
  	/* errors to */
  	p = hvalue("errors-to");
! 	if (p != NULL && !QueueRun)
  		sendtolist(p, (ADDRESS *) NULL, &e->e_errorqueue);
  
  	/* from person */
*** 5.32.0.5	1993/06/22 22:33:03
--- queue.c	1993/11/10 16:58:40
***************
*** 1335,1340 ****
--- 1335,1342 ----
  
  	{
  		char buf[MAXNAME];
+ 		if (a->q_alias == NULL && !bitset(QGOODUID, a->q_flags))
+ 			return((char *)NULL);
  		(void) strncpy(buf, a->q_paddr, MAXNAME);
  		buf[MAXNAME-1] = '\0';
  		stripquotes(buf, TRUE);
*** 5.18.0.18	1993/02/19 01:59:56
--- recipient.c	1993/11/10 19:39:23
***************
*** 240,246 ****
  	{
  		a->q_mailer = m = ProgMailer;
  		a->q_user++;
! 		if (a->q_alias == NULL && !QueueRun && !ForceMail)
  		{
  			a->q_flags |= QDONTSEND|QBADADDR;
  			usrerr("Cannot mail directly to programs");
--- 240,246 ----
  	{
  		a->q_mailer = m = ProgMailer;
  		a->q_user++;
! 		if (a->q_alias == NULL && !bitset(QGOODUID, a->q_flags) && !ForceMail)
  		{
  			a->q_flags |= QDONTSEND|QBADADDR;
  			usrerr("Cannot mail directly to programs");
***************
*** 287,293 ****
  		if (strncmp(a->q_user, ":include:", 9) == 0)
  		{
  			a->q_flags |= QDONTSEND;
! 			if (a->q_alias == NULL && !QueueRun && !ForceMail)
  			{
  				a->q_flags |= QBADADDR;
  				usrerr("Cannot mail directly to :include:s");
--- 287,293 ----
  		if (strncmp(a->q_user, ":include:", 9) == 0)
  		{
  			a->q_flags |= QDONTSEND;
! 			if (a->q_alias == NULL && !bitset(QGOODUID, a->q_flags) && !ForceMail)
  			{
  				a->q_flags |= QBADADDR;
  				usrerr("Cannot mail directly to :include:s");
***************
*** 319,325 ****
  		{
  			p = rindex(buf, '/');
  			/* check if writable or creatable */
! 			if (a->q_alias == NULL && !QueueRun && !ForceMail)
  			{
  				a->q_flags |= QDONTSEND|QBADADDR;
  				usrerr("Cannot mail directly to files");
--- 319,325 ----
  		{
  			p = rindex(buf, '/');
  			/* check if writable or creatable */
! 			if (a->q_alias == NULL && !bitset(QGOODUID, a->q_flags) && !ForceMail)
  			{
  				a->q_flags |= QDONTSEND|QBADADDR;
  				usrerr("Cannot mail directly to files");
*** 5.14.0.4	1993/01/06 16:02:14
--- savemail.c	1993/11/10 16:51:48
***************
*** 97,103 ****
  		message(Arpa_Info, "Dumping junk mail");
  		return;
  	}
- 	ForceMail = TRUE;
  	e->e_flags &= ~EF_FATALERRS;
  
  	/*
--- 97,102 ----
***************
*** 312,318 ****
--- 311,319 ----
  				Verbose = oldverb;
  				e->e_to = buf;
  				q = NULL;
+ 				ForceMail = TRUE;
  				sendtolist(buf, (ADDRESS *) NULL, &q);
+ 				ForceMail = FALSE;
  				if (deliver(e, q) == 0)
  					state = ESM_DONE;
  				else
