diff options
| author |   Gilles Chehade <gilles@poolp.org> | 2012-10-29 15:03:36 +0100 |
|---|---|---|
| committer | Gilles Chehade <gilles@poolp.org> | 2012-10-29 15:03:36 +0100 |
| commit | ba69cf6f98512fae31466b5765a4733b2a8a6fe8 (patch) | |
| tree | fb0cbf72c0b4e03e8c2c745310894a0091e98481 /smtpd/delivery_filename.c | |
| parent | Merge branch 'master' into portable (diff) | |
| download | OpenSMTPD-ba69cf6f98512fae31466b5765a4733b2a8a6fe8.tar.xz OpenSMTPD-ba69cf6f98512fae31466b5765a4733b2a8a6fe8.zip | |
overwrite from master so we can merge master
Diffstat (limited to 'smtpd/delivery_filename.c')
| -rw-r--r-- | smtpd/delivery_filename.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/smtpd/delivery_filename.c b/smtpd/delivery_filename.c index 52238ade..d0aa28bf 100644 --- a/smtpd/delivery_filename.c +++ b/smtpd/delivery_filename.c @@ -16,14 +16,9 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "includes.h" - -#ifdef HAVE_SYS_FILE_H -#include <sys/file.h> /* Needed for flock */ -#endif #include <sys/types.h> -#include "sys-queue.h" -#include "sys-tree.h" +#include <sys/queue.h> +#include <sys/tree.h> #include <sys/param.h> #include <sys/socket.h> #include <sys/stat.h> @@ -75,11 +70,7 @@ delivery_filename_open(struct deliver *deliver) error("open"); if (fstat(fd, &sb) < 0) error("fstat"); -#ifndef HAVE_STAT_ST_FLAGS if (S_ISREG(sb.st_mode) && flock(fd, LOCK_EX) < 0) -#else - if (S_ISREG(sb.st_flags) && flock(fd, LOCK_EX) < 0) -#endif error("flock"); fp = fdopen(fd, "a"); if (fp == NULL) |