From cbeab2a9b6b7ac70992175202f35fcc05a5821d5 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Mon, 9 Jan 2017 12:10:25 -0200
Subject: Revert "Import review D5409"

This reverts commit 728813a02a03cdab41bffc21d729fb394aef805c.
---
 lib/libutil/pw_util.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'lib/libutil/pw_util.c')

diff --git a/lib/libutil/pw_util.c b/lib/libutil/pw_util.c
index b369035..af749d5 100644
--- a/lib/libutil/pw_util.c
+++ b/lib/libutil/pw_util.c
@@ -226,13 +226,13 @@ pw_tmp(int mfd)
 		errno = ENAMETOOLONG;
 		return (-1);
 	}
-	if ((tfd = mkstemp(tempname)) == -1)
+	if ((tfd = mkostemp(tempname, O_SYNC)) == -1)
 		return (-1);
 	if (mfd != -1) {
 		while ((nr = read(mfd, buf, sizeof(buf))) > 0)
 			if (write(tfd, buf, (size_t)nr) != nr)
 				break;
-		if (nr != 0 || fsync(tfd) != 0) {
+		if (nr != 0) {
 			unlink(tempname);
 			*tempname = '\0';
 			close(tfd);
@@ -289,7 +289,7 @@ pw_edit(int notsetuid)
 	sigset_t oldsigset, nsigset;
 	struct stat st1, st2;
 	const char *editor;
-	int pstat, fd;
+	int pstat;
 
 	if ((editor = getenv("EDITOR")) == NULL)
 		editor = _PATH_VI;
@@ -344,11 +344,6 @@ pw_edit(int notsetuid)
 	sigprocmask(SIG_SETMASK, &oldsigset, NULL);
 	if (stat(tempname, &st2) == -1)
 		return (-1);
-	if ((fd = open(tempname, O_RDONLY)) == -1 || fsync(fd) == -1) {
-		close(fd);
-		return (-1);
-	}
-	close(fd);
 	return (st1.st_mtim.tv_sec != st2.st_mtim.tv_sec ||
 	    st1.st_mtim.tv_nsec != st2.st_mtim.tv_nsec);
 }
@@ -575,8 +570,6 @@ pw_copy(int ffd, int tfd, const struct passwd *pw, struct passwd *old_pw)
  done:
 	if (line != NULL)
 		free(line);
-	if (fsync(tfd) != 0)
-		goto err;
 	return (0);
  err:
 	if (line != NULL)
-- 
cgit v1.1