svn commit: r421441 - in branches/2016Q3/security/xinetd: . files

[Renato Botelho]

Author: garga
Date: Tue Sep  6 16:49:01 2016
New Revision: 421441
URL: https://svnweb.freebsd.org/changeset/ports/421441

Log:
  MFH: r421378
  
  Fix some edge cases in xinetd file descriptor handling
  
  This change fixes the case where the listening file descriptor is in 0~2
  range (easily reprodutible with a single UDP service)
  
  PR:		211038
  Obtained from:	pfSense
  Sponsored by:	Rubicon Communications (Netgate)
  Approved by:	ports-secteam (feld)

Added:
  branches/2016Q3/security/xinetd/files/patch-xinetd_child.c
     - copied unchanged from r421378, head/security/xinetd/files/patch-xinetd_child.c
Modified:
  branches/2016Q3/security/xinetd/Makefile
Directory Properties:
  branches/2016Q3/   (props changed)

Modified: branches/2016Q3/security/xinetd/Makefile
==============================================================================
--- branches/2016Q3/security/xinetd/Makefile	Tue Sep  6 16:28:46 2016	(r421440)
+++ branches/2016Q3/security/xinetd/Makefile	Tue Sep  6 16:49:01 2016	(r421441)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xinetd
 PORTVERSION=	2.3.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security ipv6
 MASTER_SITES=	GENTOO
 

Copied: branches/2016Q3/security/xinetd/files/patch-xinetd_child.c (from r421378, head/security/xinetd/files/patch-xinetd_child.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q3/security/xinetd/files/patch-xinetd_child.c	Tue Sep  6 16:49:01 2016	(r421441, copy of r421378, head/security/xinetd/files/patch-xinetd_child.c)
@@ -0,0 +1,24 @@
+--- xinetd/child.c.orig	2016-07-13 19:00:31 UTC
++++ xinetd/child.c
+@@ -168,7 +168,8 @@ void exec_server( const struct server *s
+    }
+ #endif
+ 
+-   (void) Sclose( descriptor ) ;
++   if ( descriptor > MAX_PASS_FD )
++      (void) Sclose( descriptor ) ;
+ 
+ #ifndef solaris
+ #if !defined(HAVE_SETSID)
+@@ -321,11 +322,6 @@ void child_process( struct server *serp 
+    signals_pending[0] = -1;
+    signals_pending[1] = -1;
+ 
+-   Sclose(0);
+-   Sclose(1);
+-   Sclose(2);
+-
+-
+ #ifdef DEBUG_SERVER
+    if ( debug.on )
+    {