Attachment 574681 Details for Bug 809272 – Proposed fix to patch in bug 795188

[patch] Proposed fix to patch in bug 795188

xinetd-2.3.14-leaking-fds-2a.patch (text/plain), 1.09 KB, created by Bryan Mason on 2012-04-02 23:37:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bryan Mason

Created: 2012-04-02 23:37:51 UTC

Size: 1.09 KB

patch

obsolete

>diff -Naur xinetd-2.3.14.old/xinetd/service.c xinetd-2.3.14.new/xinetd/service.c
>--- xinetd-2.3.14.old/xinetd/service.c	2012-03-29 13:39:11.760605428 -0700
>+++ xinetd-2.3.14.new/xinetd/service.c	2012-03-29 13:49:47.398023319 -0700
>@@ -371,12 +371,24 @@
>    {
>       msg( LOG_ERR, func,
>                   "socket creation failed (%m). service = %s", SC_ID( scp ) ) ;
>+#ifdef HAVE_POLL
>+      SVC_EVENTS( sp ) = 0;
>+      SVC_FD( sp ) = 0;
>+#else
>+      FD_CLR( SVC_FD( sp ), &ps.rws.socket_mask ) ;
>+#endif /* HAVE_POLL */
>       return( FAILED ) ;
>    }
> 
>    if ( set_fd_modes( sp ) == FAILED )
>    {
>       (void) Sclose( SVC_FD(sp) ) ;
>+#ifdef HAVE_POLL
>+      SVC_EVENTS( sp ) = 0;
>+      SVC_FD( sp ) = 0;
>+#else
>+      FD_CLR( SVC_FD( sp ), &ps.rws.socket_mask ) ;
>+#endif /* HAVE_POLL */
>       return( FAILED ) ;
>    }
> 
>@@ -390,6 +394,12 @@
>    if ( status == FAILED )
>    {
>       (void) Sclose( SVC_FD(sp) ) ;
>+#ifdef HAVE_POLL
>+      SVC_EVENTS( sp ) = 0;
>+      SVC_FD( sp ) = 0;
>+#else
>+      FD_CLR( SVC_FD( sp ), &ps.rws.socket_mask ) ;
>+#endif /* HAVE_POLL */
>       return( FAILED ) ;
>    }
>

Actions: View | Diff

Attachments on bug 809272: 574680 | 574681 | 574915