From: Alejandro Colomar <alx@kernel.org>
Date: Fri, 2 Dec 2022 21:30:24 +0000 (+0100)
Subject: Assume fchmod(2) exists
X-Git-Tag: 4.14.0-rc1~287
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c86e07067a8ced798e059f1d58dec2c1af82362;p=thirdparty%2Fshadow.git

Assume fchmod(2) exists

It is required by POSIX.1-2001.

Cc: Christian Göttsche <cgzones@googlemail.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/configure.ac b/configure.ac
index ebb3b1b0c..ae15ff8d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ AC_CHECK_HEADERS(crypt.h utmp.h \
 dnl shadow now uses the libc's shadow implementation
 AC_CHECK_HEADER([shadow.h],,[AC_MSG_ERROR([You need a libc with shadow.h])])
 
-AC_CHECK_FUNCS(arc4random_buf fchmod fchown fsync futimes \
+AC_CHECK_FUNCS(arc4random_buf fchown fsync futimes \
 	getentropy getrandom getspnam getusershell \
 	getutent initgroups lckpwdf lutimes \
 	setgroups updwtmp updwtmpx innetgr getpwnam_r \
diff --git a/lib/commonio.c b/lib/commonio.c
index 9a02ce1ac..df26c2b8b 100644
--- a/lib/commonio.c
+++ b/lib/commonio.c
@@ -261,15 +261,10 @@ static /*@null@*/ /*@dependent@*/FILE *fopen_set_perms (
 	}
 #endif				/* !HAVE_FCHOWN */
 
-#ifdef HAVE_FCHMOD
 	if (fchmod (fileno (fp), sb->st_mode & 0664) != 0) {
 		goto fail;
 	}
-#else				/* !HAVE_FCHMOD */
-	if (chmod (name, sb->st_mode & 0664) != 0) {
-		goto fail;
-	}
-#endif				/* !HAVE_FCHMOD */
+
 	return fp;
 
       fail: