svn commit: r297759 - stable/10/lib/libc/sys

[Jilles Tjoelker]

Author: jilles
Date: Sat Apr  9 19:29:39 2016
New Revision: 297759
URL: https://svnweb.freebsd.org/changeset/base/297759

Log:
  MFC r287753: setuid(2): Suggest O_CLOEXEC instead of fcntl(F_SETFD).

Modified:
  stable/10/lib/libc/sys/setuid.2
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/sys/setuid.2
==============================================================================
--- stable/10/lib/libc/sys/setuid.2	Sat Apr  9 19:09:06 2016	(r297758)
+++ stable/10/lib/libc/sys/setuid.2	Sat Apr  9 19:29:39 2016	(r297759)
@@ -28,7 +28,7 @@
 .\"     @(#)setuid.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd June 4, 1993
+.Dd September 13, 2015
 .Dt SETUID 2
 .Os
 .Sh NAME
@@ -178,15 +178,10 @@ pseudocode(void)
 	int fd;
 	/* ... */
 
-	fd = open("/path/to/sensitive/data", O_RDWR);
+	fd = open("/path/to/sensitive/data", O_RDWR | O_CLOEXEC);
 	if (fd == -1)
 		err(1, "open");
 
-	/*
-	 * Set close-on-exec flag; see fcntl(2) for more information.
-	 */
-	if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
-		err(1, "fcntl(F_SETFD)");
 	/* ... */
 	execve(path, argv, environ);
 }