svn commit: r250232 - stable/9/usr.sbin/syslogd

[Jilles Tjoelker]

Author: jilles
Date: Sat May  4 11:49:02 2013
New Revision: 250232
URL: http://svnweb.freebsd.org/changeset/base/250232

Log:
  MFC r249983: syslogd: Use closefrom() instead of getdtablesize()/close()
  loop.
  
  When syslogd forks a process for '|' destinations, it closes all file
  descriptors greater than 2.
  
  Use closefrom() for this instead of a getdtablesize()/close() loop because
  it is both faster and avoids leaving file descriptors open because the limit
  was lowered after they were opened.

Modified:
  stable/9/usr.sbin/syslogd/syslogd.c
Directory Properties:
  stable/9/usr.sbin/syslogd/   (props changed)

Modified: stable/9/usr.sbin/syslogd/syslogd.c
==============================================================================
--- stable/9/usr.sbin/syslogd/syslogd.c	Sat May  4 11:45:48 2013	(r250231)
+++ stable/9/usr.sbin/syslogd/syslogd.c	Sat May  4 11:49:02 2013	(r250232)
@@ -2476,7 +2476,7 @@ validate(struct sockaddr *sa, const char
 static int
 p_open(const char *prog, pid_t *rpid)
 {
-	int pfd[2], nulldesc, i;
+	int pfd[2], nulldesc;
 	pid_t pid;
 	sigset_t omask, mask;
 	char *argv[4]; /* sh -c cmd NULL */
@@ -2526,8 +2526,7 @@ p_open(const char *prog, pid_t *rpid)
 		dup2(pfd[0], STDIN_FILENO);
 		dup2(nulldesc, STDOUT_FILENO);
 		dup2(nulldesc, STDERR_FILENO);
-		for (i = getdtablesize(); i > 2; i--)
-			(void)close(i);
+		closefrom(3);
 
 		(void)execvp(_PATH_BSHELL, argv);
 		_exit(255);