diff -Nuar a/logrotate.c b/logrotate.c --- a/logrotate.c 2015-06-28 13:57:18.449999884 +0200 +++ b/logrotate.c 2015-06-28 14:02:20.799999876 +0200 @@ -371,15 +371,18 @@ int createOutputFile(char *fileName, int flags, struct stat *sb, acl_type acl, int force_mode) { int fd; - struct stat sb_create; - int acl_set = 0; - - fd = open(fileName, (flags | O_EXCL | O_NOFOLLOW), - (S_IRUSR | S_IWUSR) & sb->st_mode); + int acl_set = 0; + struct stat sb_create; + char template[PATH_MAX + 1]; + mode_t umask_value; + snprintf(template, PATH_MAX, "%s/logrotate_temp.XXXXXX", ourDirName(fileName)); + umask_value = umask(0000); + fd = mkostemp(template, (flags | O_EXCL | O_NOFOLLOW)); + umask(umask_value); if (fd < 0) { - message(MESS_ERROR, "error creating output file %s: %s\n", - fileName, strerror(errno)); + message(MESS_ERROR, "error creating unique temp file: %s\n", + strerror(errno)); return -1; } if (fchmod(fd, (S_IRUSR | S_IWUSR) & sb->st_mode)) { @@ -430,6 +433,13 @@ } } + if (rename(template, fileName)) { + message(MESS_ERROR, "error renaming temp file to %s: %s\n", + fileName, strerror(errno)); + close(fd); + return -1; + } + return fd; }