diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2003-03-03 17:18:01 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2003-03-03 17:18:01 +0000 |
| commit | 82f90419f3ebae01ec953cb6eb7ad164767ab43a (patch) | |
| tree | 03e1513af61d9ec133b04cc8601cfea98af01126 /contrib/sendmail/mail.local | |
| parent | 6cbdf4ebe160d2ee3e21cdfcf8d6c8790a39610e (diff) | |
| download | FreeBSD-src-82f90419f3ebae01ec953cb6eb7ad164767ab43a.zip FreeBSD-src-82f90419f3ebae01ec953cb6eb7ad164767ab43a.tar.gz | |
Fix conflicts from sendmail 8.12.8 import
Diffstat (limited to 'contrib/sendmail/mail.local')
| -rw-r--r-- | contrib/sendmail/mail.local/mail.local.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/contrib/sendmail/mail.local/mail.local.c b/contrib/sendmail/mail.local/mail.local.c index 55857b9..ed23134 100644 --- a/contrib/sendmail/mail.local/mail.local.c +++ b/contrib/sendmail/mail.local/mail.local.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2003 Sendmail, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. @@ -20,7 +20,7 @@ SM_IDSTR(copyright, Copyright (c) 1990, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n") -SM_IDSTR(id, "@(#)$Id: mail.local.c,v 8.239.2.2 2002/09/24 02:09:09 ca Exp $") +SM_IDSTR(id, "@(#)$Id: mail.local.c,v 8.239.2.4 2003/01/15 19:17:15 ca Exp $") #include <stdlib.h> #include <sm/errstring.h> @@ -1051,7 +1051,12 @@ tryagain: mbfd = -1; } } - else if (sb.st_nlink != 1 || !S_ISREG(sb.st_mode)) + else if (sb.st_nlink != 1) + { + mailerr("550 5.2.0", "%s: too many links", path); + goto err0; + } + else if (!S_ISREG(sb.st_mode)) { mailerr("550 5.2.0", "%s: irregular file", path); goto err0; |
