rpms/xinetd/F-13 xinetd-2.3.14-udp-reconfig.patch, NONE, 1.1 xinetd.spec, 1.69, 1.70

[Jan Zeleny]

Author: jzeleny

Update of /cvs/extras/rpms/xinetd/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12843

Modified Files:
	xinetd.spec 
Added Files:
	xinetd-2.3.14-udp-reconfig.patch 
Log Message:
fixed reconfiguration error when ending UDP services (#593904)

xinetd-2.3.14-udp-reconfig.patch:
 reconfig.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xinetd-2.3.14-udp-reconfig.patch ---
--- xinetd-2.3.14/xinetd/reconfig.c.orig	2010-06-01 12:58:18.000000000 +0200
+++ xinetd-2.3.14/xinetd/reconfig.c	2010-06-01 12:58:23.000000000 +0200
@@ -138,8 +138,8 @@ void hard_reconfig( void )
           *      b. Terminate running servers and cancel retry attempts, in case
           *         of reconfiguration
           */
-         svc_deactivate( osp ) ;
          terminate_servers( osp ) ;
+         svc_deactivate( osp ) ;
          cancel_service_retries( osp ) ;
 
          /*


Index: xinetd.spec
===================================================================
RCS file: /cvs/extras/rpms/xinetd/F-13/xinetd.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- xinetd.spec	19 Mar 2010 09:08:11 -0000	1.69
+++ xinetd.spec	2 Jun 2010 07:38:46 -0000	1.70
@@ -1,7 +1,7 @@
 Summary: A secure replacement for inetd
 Name: xinetd
 Version: 2.3.14
-Release: 31%{?dist}
+Release: 32%{?dist}
 License: xinetd 
 Group: System Environment/Daemons
 Epoch: 2
@@ -36,6 +36,9 @@ Patch14: xinetd-2.3.14-clean-pfd.patch
 # - furtunately, they have the same format, so everything
 #   works even without this patch
 Patch15: xinetd-2.3.14-ipv6confusion.patch
+# This fixes bug #593904 - online reconfiguration caused log message
+# flood when turning off UDP service
+Patch16: xinetd-2.3.14-udp-reconfig.patch
 
 BuildRequires: autoconf, automake
 BuildRequires: libselinux-devel >= 1.30
@@ -79,6 +82,7 @@ located in the /etc/xinetd.d directory.
 %patch13 -p1 -b .tcpmux
 %patch14 -p1 -b .clean-pfd
 %patch15 -p1 -b .ipv6confusion
+%patch16 -p1 -b .udp-reconfig
 
 aclocal
 autoconf
@@ -138,6 +142,10 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Wed Jun 02 2010 Jan Zeleny <jzeleny at redhat.com> - 2:2.3.14-32
+- fixed log message flooding when turning off UDP service during online
+  reconfiguration (#593904)
+
 * Fri Mar 19 2010 Jan Zeleny <jzeleny at redhat.com> - 2:2.3.14-31
 - corrected port parsing code (IPv4 and IPv6 were switched)
 - commented patches I'm familiar with in spec file