diff options
| author | glass <glass@NetBSD.org> | 1994-03-16 02:11:31 +0000 |
|---|---|---|
| committer | glass <glass@NetBSD.org> | 1994-03-16 02:11:31 +0000 |
| commit | 3fb497653d34cde8706b0e446e52182df5bc4ae7 (patch) | |
| tree | 378207336652cf6132b6412b0e6c3f105621d985 /usr.sbin/sendmail/src/alias.c | |
| parent | c0ae496079e5f8f6af13afb704a68b285f4d14b4 (diff) | |
sendmail 8.6.7. fixes recently discovered security hole
Diffstat (limited to 'usr.sbin/sendmail/src/alias.c')
| -rw-r--r-- | usr.sbin/sendmail/src/alias.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/usr.sbin/sendmail/src/alias.c b/usr.sbin/sendmail/src/alias.c index 66d81d77bf6..20a316200ca 100644 --- a/usr.sbin/sendmail/src/alias.c +++ b/usr.sbin/sendmail/src/alias.c @@ -36,7 +36,7 @@ # include <pwd.h> #ifndef lint -static char sccsid[] = "@(#)alias.c 8.21 (Berkeley) 12/11/93"; +static char sccsid[] = "@(#)alias.c 8.24 (Berkeley) 2/28/94"; #endif /* not lint */ @@ -114,7 +114,9 @@ alias(a, sendq, e) message("aliased to %s", p); #ifdef LOG if (LogLevel > 9) - syslog(LOG_INFO, "%s: alias %s => %s", e->e_id, a->q_paddr, p); + syslog(LOG_INFO, "%s: alias %s => %s", + e->e_id == NULL ? "NOQUEUE" : e->e_id, + a->q_paddr, p); #endif a->q_flags &= ~QSELFREF; AliasLevel++; @@ -417,7 +419,7 @@ rebuildaliases(map, automatic) /* try to lock the source file */ if ((af = fopen(map->map_file, "r+")) == NULL) { - if (errno != EACCES || automatic || + if ((errno != EACCES && errno != EROFS) || automatic || (af = fopen(map->map_file, "r")) == NULL) { int saveerr = errno; @@ -748,7 +750,8 @@ forward(user, sendq, e) #ifdef LOG if (LogLevel > 2) syslog(LOG_ERR, "%s: forward %s: transient error: %s", - e->e_id, buf, errstring(err)); + e->e_id == NULL ? "NOQUEUE" : e->e_id, + buf, errstring(err)); #endif message("%s: %s: message queued", buf, errstring(err)); user->q_flags |= QQUEUEUP; |
