rpms/xinetd/F-12 xinetd-2.3.14-tcpmux.patch, NONE, 1.1 xinetd.spec, 1.67, 1.68

[Jan Zeleny]

Author: jzeleny

Update of /cvs/extras/rpms/xinetd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12473

Modified Files:
	xinetd.spec 
Added Files:
	xinetd-2.3.14-tcpmux.patch 
Log Message:
fixed issue with tcpmux service causing segafults (#543968)

xinetd-2.3.14-tcpmux.patch:
 service.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE xinetd-2.3.14-tcpmux.patch ---
--- xinetd-2.3.14/xinetd/service.c.tcpmux	2010-01-21 09:50:05.000000000 +0100
+++ xinetd-2.3.14/xinetd/service.c	2010-01-21 10:21:14.000000000 +0100
@@ -952,7 +952,12 @@ void close_all_svc_descriptors(void)
         out_of_memory( "close_all_svc_descriptors" ) ;
 
    for ( osp = SP( psi_start( iter ) ) ; osp ; osp = SP( psi_next( iter ) ) )
-        (void) Sclose( SVC_FD( osp ) ) ;
+   {
+#ifdef HAVE_POLL
+        if ( osp && SVC_POLLFD( osp ) )
+#endif
+            (void) Sclose( SVC_FD( osp ) ) ;
+   }
   
    psi_destroy( iter ) ;
 }


Index: xinetd.spec
===================================================================
RCS file: /cvs/extras/rpms/xinetd/F-12/xinetd.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- xinetd.spec	20 Oct 2009 13:34:00 -0000	1.67
+++ xinetd.spec	21 Jan 2010 09:44:41 -0000	1.68
@@ -22,6 +22,7 @@ Patch9: xinetd-2.3.14-readable-debuginfo
 Patch10: xinetd-2.3.14-autoconf.patch
 Patch11: xinetd-2.3.14-poll.patch
 Patch12: xinetd-2.3.14-file-limit.patch
+Patch13: xinetd-2.3.14-tcpmux.patch
 
 BuildRequires: autoconf, automake
 BuildRequires: libselinux-devel >= 1.30
@@ -62,6 +63,7 @@ located in the /etc/xinetd.d directory.
 %patch10 -p1 -b .autoconf
 %patch11 -p1 -b .poll
 %patch12 -p1 -b .file-limit
+%patch13 -p1 -b .tcpmux
 
 aclocal
 autoconf
@@ -121,6 +123,9 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Thu Jan 21 2010 Jan Zeleny <jzeleny at redhat.com> - 2:2.3.14-29
+- fixed issue with segfaulting tcpmux service (#543968)
+
 * Tue Oct 20 2009 Jan Zeleny <jzeleny at redhat.com> - 2:2.3.14-28
 - added support for new configuration option - file limit for service