summaryrefslogtreecommitdiff
path: root/contrib/sendmail/src/savemail.c
diff options
context:
space:
mode:
authorGregory Neil Shapiro <gshapiro@FreeBSD.org>2000-10-01 02:03:50 +0000
committerGregory Neil Shapiro <gshapiro@FreeBSD.org>2000-10-01 02:03:50 +0000
commitd995d2ba6b346ad29395c43f83421c01a446d2ae (patch)
treed8256a7f3052e793e68309e6e24f371b7e77065b /contrib/sendmail/src/savemail.c
parenta9ff8c001c741032fbc358f1f6245a08862c4eaa (diff)
Notes
Diffstat (limited to 'contrib/sendmail/src/savemail.c')
-rw-r--r--contrib/sendmail/src/savemail.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/sendmail/src/savemail.c b/contrib/sendmail/src/savemail.c
index 9a196b0c78f5..a5173ebee95c 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");
}
}