diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2000-10-01 02:03:50 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2000-10-01 02:03:50 +0000 |
| commit | 1bbf49b55a2601a4b47f84ef0db64d5bbc97608f (patch) | |
| tree | 8243eef774bd2693d62f2204f2be075a5b646c32 /contrib/sendmail/src/savemail.c | |
| parent | 0cc8aac437ca5de8f94291323499241c949261f9 (diff) | |
| download | FreeBSD-src-1bbf49b55a2601a4b47f84ef0db64d5bbc97608f.zip FreeBSD-src-1bbf49b55a2601a4b47f84ef0db64d5bbc97608f.tar.gz | |
Fix conflicts from merge of sendmail 8.11.1
Diffstat (limited to 'contrib/sendmail/src/savemail.c')
| -rw-r--r-- | contrib/sendmail/src/savemail.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/sendmail/src/savemail.c b/contrib/sendmail/src/savemail.c index 9a196b0..a5173eb 100644 --- a/contrib/sendmail/src/savemail.c +++ b/contrib/sendmail/src/savemail.c @@ -12,7 +12,7 @@ */ #ifndef lint -static char id[] = "@(#)$Id: savemail.c,v 8.212.4.3 2000/06/13 07:16:26 gshapiro Exp $"; +static char id[] = "@(#)$Id: savemail.c,v 8.212.4.5 2000/08/22 22:46:00 gshapiro Exp $"; #endif /* ! lint */ /* $FreeBSD$ */ @@ -334,7 +334,8 @@ savemail(e, sendbody) { if (e->e_from.q_home != NULL) p = e->e_from.q_home; - else if ((pw = sm_getpwnam(e->e_from.q_user)) != NULL) + else if ((pw = sm_getpwnam(e->e_from.q_user)) != NULL && + *pw->pw_dir != '\0') p = pw->pw_dir; } if (p == NULL || e->e_dfp == NULL) @@ -447,6 +448,7 @@ savemail(e, sendbody) case ESM_PANIC: /* leave the locked queue & transcript files around */ loseqfile(e, "savemail panic"); + errno = 0; syserr("!554 savemail: cannot save rejected email anywhere"); } } |
