rpms/xinetd/devel xinetd-2.3.14-bind-ipv6.patch, NONE, 1.1 xinetd.spec, 1.43, 1.44

[Jan Šafránek (jsafrane)]

Author: jsafrane

Update of /cvs/pkgs/rpms/xinetd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1069

Modified Files:
	xinetd.spec 
Added Files:
	xinetd-2.3.14-bind-ipv6.patch 
Log Message:
bind IPv6 socket by default and switch to IPv4 on error
Resolves: 195265

xinetd-2.3.14-bind-ipv6.patch:

--- NEW FILE xinetd-2.3.14-bind-ipv6.patch ---
--- xinetd-2.3.14/xinetd/service.c.old	2007-05-16 15:33:41.000000000 +0200
+++ xinetd-2.3.14/xinetd/service.c	2007-05-16 15:29:53.000000000 +0200
@@ -335,6 +335,15 @@
 
    if ( SVC_FD(sp) == -1 )
    {
+      if (SC_BIND_ADDR(scp) == NULL && SC_IPV6( scp )) 
+      {
+         /* there was no bind address configured and IPv6 fails. Try IPv4 */
+         msg( LOG_NOTICE, func, "IPv6 socket creation failed for service %s, trying IPv4", SC_ID( scp ) ) ; 
+         M_CLEAR(SC_XFLAGS(scp), SF_IPV6);
+         M_SET(SC_XFLAGS(scp), SF_IPV4);
+         return svc_activate(sp);
+      }
+
       msg( LOG_ERR, func,
                   "socket creation failed (%m). service = %s", SC_ID( scp ) ) ;
       return( FAILED ) ;
--- xinetd-2.3.14/xinetd/confparse.c.old	2007-05-16 15:33:26.000000000 +0200
+++ xinetd-2.3.14/xinetd/confparse.c	2007-05-16 15:15:22.000000000 +0200
@@ -245,7 +245,7 @@
              M_SET(SC_XFLAGS(scp), SF_IPV6);
       }
       else
-         M_SET(SC_XFLAGS(scp), SF_IPV4);
+         M_SET(SC_XFLAGS(scp), SF_IPV6); /*try bind IPv6 by default*/
    }
 
    if (SC_ORIG_BIND_ADDR(scp))


Index: xinetd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xinetd/devel/xinetd.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- xinetd.spec	4 Dec 2006 16:56:23 -0000	1.43
+++ xinetd.spec	17 May 2007 06:42:34 -0000	1.44
@@ -4,7 +4,7 @@
 Summary: A secure replacement for inetd.
 Name: xinetd
 Version: 2.3.14
-Release: 11
+Release: 12
 License: Distributable (BSD-like)
 Group: System Environment/Daemons
 Epoch: 2
@@ -18,6 +18,8 @@
 Patch1: xinetd-2.3.12-tcp_rpc.patch
 Patch2: xinetd-2.3.14-label.patch
 Patch3: xinetd-2.3.14-contextconf.patch
+Patch4: xinetd-2.3.14-bind-ipv6.patch
+
 BuildRequires: autoconf, automake
 BuildRequires: libselinux-devel >= 1.30
 Prereq: /sbin/chkconfig /etc/init.d /sbin/service
@@ -43,6 +45,7 @@
 %patch1 -p1 -b .tcp_rpc
 %patch2 -p1 -b .lspp
 %patch3 -p1 -b .confcntx
+%patch4 -p1 -b .bind
 
 aclocal
 autoconf
@@ -104,6 +107,10 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed May 16 2007 Jan Safranek <jsafranek at redhat.com> - 2:2.3.14-12
+- bind IPv6 socket by default and switch to IPv4 on error
+  (bz#195265)
+
 * Mon Dec  4 2006 Thomas Woerner <twoerner at redhat.com> - 2:2.3.14-11
 - tcp_wrappers has a new devel and libs sub package, therefore changing build
   requirement for tcp_wrappers to tcp_wrappers-devel