Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Various small fixes #2

Merged
merged 5 commits into from

2 participants

Jan Synacek synacknet
This page is out of date. Refresh to see the latest.
3  xinetd/connection.c
View
@@ -183,7 +183,8 @@ void conn_free( connection_s *cp, int release_mem )
}
cp->co_sp = NULL;
- CONN_CLOSE( cp ) ;
+ if ( CONN_DESCRIPTOR( cp ) > 0 )
+ CONN_CLOSE( cp ) ;
CLEAR( *cp ) ;
if (release_mem) {
3  xinetd/int.c
View
@@ -109,7 +109,8 @@ static int get_server_socket( struct intercept_s *ip )
struct service *sp = SERVER_SERVICE( INT_SERVER( ip ) ) ;
union xsockaddr *sinp = INT_LOCALADDR( ip ) ;
int sd ;
- socklen_t size ;
+ socklen_t size = AF_UNIX ;
+
const char *func = "get_server_socket" ;
if( SC_IPV6(SVC_CONF(sp)) ) {
5 xinetd/sconf.c
View
@@ -153,6 +153,11 @@ struct service_config *sc_make_special( const char *service_name,
if ( SC_ID(scp) == NULL )
{
out_of_memory( func ) ;
+ /*
+ * Since we're returning instead of exiting, it's probably a good idea to
+ * free scp
+ */
+ sc_free( scp );
return( NULL ) ;
}
SC_SPECIFY( scp, A_ID ) ;
3  xinetd/service.c
View
@@ -908,7 +908,10 @@ void close_all_svc_descriptors(void)
/* Have to close all other descriptors here */
iter = psi_create( SERVICES( ps ) ) ;
if ( iter == NULL )
+ {
out_of_memory( "close_all_svc_descriptors" ) ;
+ exit( 1 );
+ }
for ( osp = SP( psi_start( iter ) ) ; osp ; osp = SP( psi_next( iter ) ) )
(void) Sclose( SVC_FD( osp ) ) ;
2  xinetd/xinetd.conf.man
View
@@ -233,7 +233,7 @@ determines the program to execute for this service.
determines the arguments passed to the server. In contrast to \fBinetd\fP,
the server name should \fInot\fP be included in \fIserver_args\fP.
.TP
-+.B libwrap
+.B libwrap
overrides the service name passed to libwrap (which defaults to the
server name, the first server_args component with NAMEINARGS, the id
for internal services and the service name for redirected services).
Something went wrong with that request. Please try again.