Update to 2.3.15
Drop patches merged by upstream (-log-crash, -tcp_rpc, -label, -contextconf, -ssize_t) Update -pie, -PIE, -poll patch Resolves: #820927
This commit is contained in:
Jan Synacek
parent
8335f46295
commit
8b25de519c
13 changed files with 60 additions and 1110 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1 +1,2 @@
|
|||
xinetd-2.3.14.tar.gz
|
||||
/xinetd-2.3.15.tar.gz
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
567382d7972613090215c6c54f9b82d9 xinetd-2.3.14.tar.gz
|
||||
77358478fd58efa6366accae99b8b04c xinetd-2.3.15.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
--- xinetd/Makefile.in.pie 2003-06-07 09:47:24.000000000 -0700
|
||||
+++ xinetd/Makefile.in 2003-10-28 10:59:55.000000000 -0800
|
||||
@@ -119,7 +119,7 @@
|
||||
$(CC) $(CFLAGS) $(DEBUG) $(SRCDIR)/itox.c -o $@ $(LDFLAGS) $(LIBS)
|
||||
|
||||
xinetd: $(OBJS)
|
||||
- $(CC) $(CFLAGS) $(DEBUG) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) || rm -f $@
|
||||
+ $(CC) $(CFLAGS) $(DEBUG) -o $@ -PIE $(OBJS) $(LDFLAGS) $(LIBS) || rm -f $@
|
||||
|
||||
clean:
|
||||
rm -f $(OBJS) $(NAME) core itox
|
||||
--- Makefile.in.pie 2003-10-28 10:54:39.000000000 -0800
|
||||
+++ Makefile.in 2003-10-28 10:54:39.000000000 -0800
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
LIBS = -lsio -lstr -lmisc -lxlog -lportable -lpset @LIBS@
|
||||
|
||||
-CFLAGS += @CFLAGS@
|
||||
+CFLAGS += @CFLAGS@ -fPIE
|
||||
DCFLAGS = -Wall -Wredundant-decls -W -Wfloat-equal -Wundef -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Wmissing-format-attribute -Wshadow -Wpointer-arith -g
|
||||
|
||||
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
--- xinetd/Makefile.in.pie 2003-06-07 09:47:24.000000000 -0700
|
||||
+++ xinetd/Makefile.in 2003-10-28 10:59:55.000000000 -0800
|
||||
@@ -119,7 +119,7 @@
|
||||
$(CC) $(CFLAGS) $(DEBUG) $(SRCDIR)/itox.c -o $@ $(LDFLAGS) $(LIBS)
|
||||
|
||||
xinetd: $(OBJS)
|
||||
- $(CC) $(CFLAGS) $(DEBUG) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) || rm -f $@
|
||||
+ $(CC) $(CFLAGS) $(DEBUG) -o $@ -pie $(OBJS) $(LDFLAGS) $(LIBS) || rm -f $@
|
||||
|
||||
clean:
|
||||
rm -f $(OBJS) $(NAME) core itox
|
||||
--- Makefile.in.pie 2003-10-28 10:54:39.000000000 -0800
|
||||
+++ Makefile.in 2003-10-28 10:54:39.000000000 -0800
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
LIBS = -lsio -lstr -lmisc -lxlog -lportable -lpset @LIBS@
|
||||
|
||||
-CFLAGS += @CFLAGS@
|
||||
+CFLAGS += @CFLAGS@ -fpie
|
||||
DCFLAGS = -Wall -Wredundant-decls -W -Wfloat-equal -Wundef -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Wmissing-format-attribute -Wshadow -Wpointer-arith -g
|
||||
|
||||
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
--- xinetd-2.3.12/xinetd/service.c.tcp_rpc 2003-06-27 21:05:06.000000000 -0400
|
||||
+++ xinetd-2.3.12/xinetd/service.c 2004-01-29 23:09:29.000000000 -0500
|
||||
@@ -181,6 +181,9 @@
|
||||
else
|
||||
memset( &tsin, 0, sizeof(tsin));
|
||||
|
||||
+ if ( SC_PROTOVAL ( scp ) == IPPROTO_TCP ) {
|
||||
+ M_SET ( scp->sc_xflags, SF_NOLIBWRAP );
|
||||
+ }
|
||||
if( SC_IPV4( scp ) ) {
|
||||
tsin.sa_in.sin_family = AF_INET ;
|
||||
sin_len = sizeof(struct sockaddr_in);
|
||||
--- xinetd-2.3.12/xinetd/xinetd.conf.man.tcp_rpc 2004-01-30 12:38:59.000000000 -0500
|
||||
+++ xinetd-2.3.12/xinetd/xinetd.conf.man 2004-01-30 12:43:50.000000000 -0500
|
||||
@@ -123,6 +123,8 @@
|
||||
to the service. This may be needed in order to use libwrap functionality
|
||||
not available to long-running processes such as xinetd; in this case,
|
||||
the tcpd program can be called explicitly (see also the NAMEINARGS flag).
|
||||
+For RPC services using TCP transport, this flag is automatically turned on,
|
||||
+because xinetd cannot get remote host address information for the rpc port.
|
||||
.TP
|
||||
.B SENSOR
|
||||
This replaces the service with a sensor that detects accesses to the
|
||||
@@ -1215,6 +1217,10 @@
|
||||
access control on the address of the remote host is not performed when
|
||||
\fIwait\fP is \fIyes\fP and \fIsocket_type\fP is \fIstream\fP.
|
||||
.LP
|
||||
+The NOLIBWRAP flag is automatically turned on for RPC services whose
|
||||
+\fIsocket_type\fP is \fIstream\fP because xinetd cannot determine the
|
||||
+address of the remote host.
|
||||
+.LP
|
||||
If the
|
||||
.B INTERCEPT
|
||||
flag is not used,
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
244063: RHEL4 SIGSEGV in xinetd when application's logfile hit size limit
|
||||
|
||||
Written-By: Jan Safranek <jsafrane@redhat.com>
|
||||
|
||||
Initialize xl_callback_arg, so xinetd does not crash when it gets dereferenced.
|
||||
|
||||
diff -up xinetd-2.3.13/libs/src/xlog/xlog.c.orig xinetd-2.3.13/libs/src/xlog/xlog.c
|
||||
--- xinetd-2.3.13/libs/src/xlog/xlog.c.orig 2003-05-31 23:58:58.000000000 +0200
|
||||
+++ xinetd-2.3.13/libs/src/xlog/xlog.c 2007-12-05 15:31:08.000000000 +0100
|
||||
@@ -216,6 +216,7 @@ int xlog_control( xlog_h pxlog, xlog_cmd
|
||||
|
||||
case XLOG_CALLBACK:
|
||||
xp->xl_callback = va_arg( ap, voidfunc ) ;
|
||||
+ xp->xl_callback_arg = va_arg( ap, void * );
|
||||
break ;
|
||||
|
||||
case XLOG_GETFLAG:
|
||||
|
|
@ -1,110 +0,0 @@
|
|||
diff -rup xinetd-2.3.14-orig/xinetd/child.c xinetd-2.3.14/xinetd/child.c
|
||||
--- xinetd-2.3.14-orig/xinetd/child.c 2006-11-28 14:03:07.000000000 -0500
|
||||
+++ xinetd-2.3.14/xinetd/child.c 2006-11-29 17:04:19.000000000 -0500
|
||||
@@ -33,6 +33,8 @@
|
||||
#endif
|
||||
#ifdef LABELED_NET
|
||||
#include <selinux/selinux.h>
|
||||
+#include <selinux/flask.h>
|
||||
+#include <selinux/context.h>
|
||||
#endif
|
||||
|
||||
#include "str.h"
|
||||
@@ -49,7 +51,7 @@
|
||||
|
||||
/* Local declarations */
|
||||
#ifdef LABELED_NET
|
||||
-static int set_context_from_socket( int fd );
|
||||
+static int set_context_from_socket( const struct service_config *scp, int fd );
|
||||
#endif
|
||||
|
||||
|
||||
@@ -158,7 +160,7 @@ void exec_server( const struct server *s
|
||||
#ifdef LABELED_NET
|
||||
if (SC_LABELED_NET(scp))
|
||||
{
|
||||
- if (set_context_from_socket( descriptor ) < 0) {
|
||||
+ if (set_context_from_socket( scp, descriptor ) < 0) {
|
||||
msg( LOG_ERR, func,
|
||||
"Changing process context failed for %s", SC_ID( scp )) ;
|
||||
_exit( 1 ) ;
|
||||
@@ -485,16 +487,11 @@ void child_exit(void)
|
||||
}
|
||||
|
||||
#ifdef LABELED_NET
|
||||
-static int set_context_from_socket( int fd )
|
||||
+static int set_context( security_context_t cntx )
|
||||
{
|
||||
- const char *func = "set_context_from_socket" ;
|
||||
- security_context_t peer_context;
|
||||
+ const char *func = "set_context" ;
|
||||
|
||||
- if (getpeercon(fd, &peer_context) < 0)
|
||||
- return -1;
|
||||
-
|
||||
- int retval = setexeccon(peer_context);
|
||||
- freecon( peer_context );
|
||||
+ int retval = setexeccon(cntx);
|
||||
|
||||
if (debug.on)
|
||||
{
|
||||
@@ -513,4 +510,59 @@ static int set_context_from_socket( int
|
||||
|
||||
return retval;
|
||||
}
|
||||
+
|
||||
+static int set_context_from_socket( const struct service_config *scp, int fd )
|
||||
+{
|
||||
+ security_context_t curr_context = NULL;
|
||||
+ security_context_t peer_context = NULL;
|
||||
+ security_context_t exec_context = NULL;
|
||||
+ context_t bcon = NULL;
|
||||
+ context_t pcon = NULL;
|
||||
+ security_context_t new_context = NULL;
|
||||
+ security_context_t new_exec_context = NULL;
|
||||
+ int retval = -1;
|
||||
+ const char *exepath = NULL;
|
||||
+
|
||||
+ if (getcon(&curr_context) < 0)
|
||||
+ goto fail;
|
||||
+
|
||||
+ if (getpeercon(fd, &peer_context) < 0)
|
||||
+ goto fail;
|
||||
+
|
||||
+ exepath = SC_SERVER( scp );
|
||||
+ if (getfilecon(exepath, &exec_context) < 0)
|
||||
+ goto fail;
|
||||
+
|
||||
+ if (!(bcon = context_new(curr_context)))
|
||||
+ goto fail;
|
||||
+
|
||||
+ if (!(pcon = context_new(peer_context)))
|
||||
+ goto fail;
|
||||
+
|
||||
+ if (!context_range_get(pcon))
|
||||
+ goto fail;
|
||||
+
|
||||
+ if (context_range_set(bcon, context_range_get(pcon)))
|
||||
+ goto fail;
|
||||
+
|
||||
+ if (!(new_context = context_str(bcon)))
|
||||
+ goto fail;
|
||||
+
|
||||
+ if (security_compute_create(new_context, exec_context, SECCLASS_PROCESS,
|
||||
+ &new_exec_context) < 0)
|
||||
+ goto fail;
|
||||
+
|
||||
+ retval = set_context(new_exec_context);
|
||||
+
|
||||
+ freecon(new_exec_context);
|
||||
+
|
||||
+ fail:
|
||||
+ context_free(pcon);
|
||||
+ context_free(bcon);
|
||||
+ freecon(exec_context);
|
||||
+ freecon(peer_context);
|
||||
+ freecon(curr_context);
|
||||
+
|
||||
+ return retval;
|
||||
+}
|
||||
#endif
|
||||
|
|
@ -1,227 +0,0 @@
|
|||
diff -urp xinetd-2.3.14.orig/config.h.in xinetd-2.3.14/config.h.in
|
||||
--- xinetd-2.3.14.orig/config.h.in 2006-06-16 13:20:01.000000000 -0400
|
||||
+++ xinetd-2.3.14/config.h.in 2006-09-20 17:12:00.000000000 -0400
|
||||
@@ -112,6 +112,7 @@
|
||||
/* Options */
|
||||
#undef HAVE_LIBWRAP
|
||||
#undef LIBWRAP
|
||||
+#undef LABELED_NET
|
||||
|
||||
#undef HAVE_LOADAVG
|
||||
|
||||
diff -urp xinetd-2.3.14.orig/configure.in xinetd-2.3.14/configure.in
|
||||
--- xinetd-2.3.14.orig/configure.in 2006-06-16 13:20:01.000000000 -0400
|
||||
+++ xinetd-2.3.14/configure.in 2006-09-20 17:12:00.000000000 -0400
|
||||
@@ -289,6 +289,34 @@ AC_ARG_WITH(libwrap,
|
||||
AC_MSG_RESULT(no)
|
||||
)
|
||||
|
||||
+AC_MSG_CHECKING(whether to use labeled-networking)
|
||||
+AC_ARG_WITH(labeled-networking,
|
||||
+[ --with-labeled-networking[=PATH] Compile in labeled networking support.],
|
||||
+[ case "$withval" in
|
||||
+ no)
|
||||
+ AC_MSG_RESULT(no)
|
||||
+ ;;
|
||||
+ yes)
|
||||
+ AC_MSG_RESULT(yes)
|
||||
+ AC_CHECK_LIB(selinux, setexeccon, [
|
||||
+ AC_DEFINE(LABELED_NET)
|
||||
+ LABELLIBS="-lselinux" ])
|
||||
+ LIBS="$LABELLIBS $LIBS"
|
||||
+ ;;
|
||||
+ *)
|
||||
+ AC_MSG_RESULT(yes)
|
||||
+ AC_DEFINE(LABELED_NET)
|
||||
+ if test -d "$withval"; then
|
||||
+ LABELLIBS="-L$withval -lselinux"
|
||||
+ else
|
||||
+ LABELLIBS="$withval"
|
||||
+ fi
|
||||
+ LIBS="$LABELLIBS $LIBS"
|
||||
+ ;;
|
||||
+ esac ],
|
||||
+ AC_MSG_RESULT(no)
|
||||
+)
|
||||
+
|
||||
AC_FUNC_MMAP
|
||||
|
||||
AC_CHECK_FUNCS(isatty)
|
||||
diff -urp xinetd-2.3.14.orig/xinetd/child.c xinetd-2.3.14/xinetd/child.c
|
||||
--- xinetd-2.3.14.orig/xinetd/child.c 2006-06-16 13:20:01.000000000 -0400
|
||||
+++ xinetd-2.3.14/xinetd/child.c 2006-09-20 17:12:00.000000000 -0400
|
||||
@@ -31,6 +31,9 @@
|
||||
#ifdef HAVE_NETDB_H
|
||||
#include <netdb.h>
|
||||
#endif
|
||||
+#ifdef LABELED_NET
|
||||
+#include <selinux/selinux.h>
|
||||
+#endif
|
||||
|
||||
#include "str.h"
|
||||
#include "child.h"
|
||||
@@ -44,6 +47,12 @@
|
||||
#include "options.h"
|
||||
#include "redirect.h"
|
||||
|
||||
+/* Local declarations */
|
||||
+#ifdef LABELED_NET
|
||||
+static int set_context_from_socket( int fd );
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
/*
|
||||
* This function is running in the new process
|
||||
*/
|
||||
@@ -143,6 +152,20 @@ void exec_server( const struct server *s
|
||||
}
|
||||
#endif
|
||||
|
||||
+ /*
|
||||
+ Set the context if the option was given
|
||||
+ */
|
||||
+#ifdef LABELED_NET
|
||||
+ if (SC_LABELED_NET(scp))
|
||||
+ {
|
||||
+ if (set_context_from_socket( descriptor ) < 0) {
|
||||
+ msg( LOG_ERR, func,
|
||||
+ "Changing process context failed for %s", SC_ID( scp )) ;
|
||||
+ _exit( 1 ) ;
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
(void) Sclose( descriptor ) ;
|
||||
|
||||
#ifndef solaris
|
||||
@@ -461,3 +484,33 @@ void child_exit(void)
|
||||
}
|
||||
}
|
||||
|
||||
+#ifdef LABELED_NET
|
||||
+static int set_context_from_socket( int fd )
|
||||
+{
|
||||
+ const char *func = "set_context_from_socket" ;
|
||||
+ security_context_t peer_context;
|
||||
+
|
||||
+ if (getpeercon(fd, &peer_context) < 0)
|
||||
+ return -1;
|
||||
+
|
||||
+ int retval = setexeccon(peer_context);
|
||||
+ freecon( peer_context );
|
||||
+
|
||||
+ if (debug.on)
|
||||
+ {
|
||||
+ security_context_t current_exec_context;
|
||||
+ if ( getexeccon( ¤t_exec_context ) == 0 ) {
|
||||
+
|
||||
+ msg( LOG_DEBUG, func,
|
||||
+ "current security exec context now: %s",
|
||||
+ current_exec_context ? current_exec_context : "unknown" );
|
||||
+
|
||||
+ freecon( current_exec_context );
|
||||
+ }
|
||||
+ else
|
||||
+ msg( LOG_DEBUG, func, "Error calling getexeccon: %m" );
|
||||
+ }
|
||||
+
|
||||
+ return retval;
|
||||
+}
|
||||
+#endif
|
||||
diff -urp xinetd-2.3.14.orig/xinetd/confparse.c xinetd-2.3.14/xinetd/confparse.c
|
||||
--- xinetd-2.3.14.orig/xinetd/confparse.c 2006-06-16 13:20:01.000000000 -0400
|
||||
+++ xinetd-2.3.14/xinetd/confparse.c 2006-09-20 17:16:35.000000000 -0400
|
||||
@@ -697,6 +697,35 @@ static status_e check_entry( struct serv
|
||||
return( FAILED ) ;
|
||||
}
|
||||
|
||||
+#ifdef LABELED_NET
|
||||
+ if (SC_LABELED_NET(scp)) {
|
||||
+ if ( SC_IS_INTERNAL( scp ) ) {
|
||||
+ msg( LOG_ERR, func,
|
||||
+ "Internal services cannot support labeled networking: %s",
|
||||
+ SC_ID(scp) ) ;
|
||||
+ return( FAILED ) ;
|
||||
+ }
|
||||
+ if ( SC_SOCKET_TYPE(scp) != SOCK_STREAM ) {
|
||||
+ msg( LOG_ERR, func,
|
||||
+ "Non-stream socket types cannot support labeled networking: %s",
|
||||
+ SC_ID(scp) ) ;
|
||||
+ return( FAILED ) ;
|
||||
+ }
|
||||
+ if ( SC_WAITS( scp ) ) {
|
||||
+ msg( LOG_ERR, func,
|
||||
+ "Tcp wait services cannot support labeled networking: %s",
|
||||
+ SC_ID(scp) ) ;
|
||||
+ return( FAILED ) ;
|
||||
+ }
|
||||
+ if ( SC_REDIR_ADDR( scp ) != NULL) {
|
||||
+ msg( LOG_ERR, func,
|
||||
+ "Redirected services cannot support labeled networking: %s",
|
||||
+ SC_ID(scp) ) ;
|
||||
+ return( FAILED ) ;
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
if ( SC_IS_MUXCLIENT( scp ) )
|
||||
{
|
||||
if ( !SC_IS_UNLISTED( scp ) )
|
||||
diff -urp xinetd-2.3.14.orig/xinetd/main.c xinetd-2.3.14/xinetd/main.c
|
||||
--- xinetd-2.3.14.orig/xinetd/main.c 2006-06-16 13:20:01.000000000 -0400
|
||||
+++ xinetd-2.3.14/xinetd/main.c 2006-09-20 17:12:00.000000000 -0400
|
||||
@@ -80,7 +80,10 @@ int main( int argc, char *argv[] )
|
||||
#ifdef HAVE_DNSREGISTRATION
|
||||
"rendezvous "
|
||||
#endif
|
||||
-#if !defined(LIBWRAP) && !defined(HAVE_LOADAVG) && !defined(HAVE_MDNS) && !defined(HAVE_HOWL) && !defined(HAVE_DNSREGISTRATION)
|
||||
+#ifdef LABELED_NET
|
||||
+ "labeled-networking "
|
||||
+#endif
|
||||
+#if !defined(LIBWRAP) && !defined(HAVE_LOADAVG) && !defined(HAVE_MDNS) && !defined(HAVE_HOWL) && !defined(HAVE_DNSREGISTRATION) && !defined(LABELED_NET)
|
||||
"no "
|
||||
#endif
|
||||
"options compiled in."
|
||||
diff -urp xinetd-2.3.14.orig/xinetd/nvlists.c xinetd-2.3.14/xinetd/nvlists.c
|
||||
--- xinetd-2.3.14.orig/xinetd/nvlists.c 2006-06-16 13:20:01.000000000 -0400
|
||||
+++ xinetd-2.3.14/xinetd/nvlists.c 2006-09-20 17:12:00.000000000 -0400
|
||||
@@ -47,6 +47,7 @@ const struct name_value service_flags[]
|
||||
{ "SENSOR", SF_SENSOR },
|
||||
{ "IPv4", SF_IPV4 },
|
||||
{ "IPv6", SF_IPV6 },
|
||||
+ { "LABELED", SF_LABELED },
|
||||
{ CHAR_NULL, 0 }
|
||||
} ;
|
||||
|
||||
diff -urp xinetd-2.3.14.orig/xinetd/sconf.h xinetd-2.3.14/xinetd/sconf.h
|
||||
--- xinetd-2.3.14.orig/xinetd/sconf.h 2006-06-16 13:20:01.000000000 -0400
|
||||
+++ xinetd-2.3.14/xinetd/sconf.h 2006-09-20 17:12:00.000000000 -0400
|
||||
@@ -58,6 +58,7 @@
|
||||
#define SF_SENSOR 9
|
||||
#define SF_IPV4 10
|
||||
#define SF_IPV6 11
|
||||
+#define SF_LABELED 12
|
||||
|
||||
/*
|
||||
* Values for log options
|
||||
@@ -239,6 +240,7 @@ struct service_config
|
||||
#define SC_SENSOR( scp ) M_IS_SET( (scp)->sc_xflags, SF_SENSOR )
|
||||
#define SC_IPV4( scp ) M_IS_SET( (scp)->sc_xflags, SF_IPV4 )
|
||||
#define SC_IPV6( scp ) M_IS_SET( (scp)->sc_xflags, SF_IPV6 )
|
||||
+#define SC_LABELED_NET( scp ) M_IS_SET( (scp)->sc_xflags, SF_LABELED )
|
||||
|
||||
#define SC_IS_RPC( scp ) ( M_IS_SET( (scp)->sc_type, ST_RPC ) )
|
||||
#define SC_IS_INTERNAL( scp ) ( M_IS_SET( (scp)->sc_type, ST_INTERNAL ) )
|
||||
diff -urp xinetd-2.3.14.orig/xinetd/xinetd.conf.man xinetd-2.3.14/xinetd/xinetd.conf.man
|
||||
--- xinetd-2.3.14.orig/xinetd/xinetd.conf.man 2006-06-16 13:20:01.000000000 -0400
|
||||
+++ xinetd-2.3.14/xinetd/xinetd.conf.man 2006-09-20 17:12:00.000000000 -0400
|
||||
@@ -145,6 +145,9 @@ Sets the service to be an IPv4 service (
|
||||
.B IPv6
|
||||
Sets the service to be an IPv6 service (AF_INET6), if IPv6 is available on the system.
|
||||
.TP
|
||||
+.B LABELED
|
||||
+The LABELED flag will tell xinetd to change the child processes SE Linux context to match that of the incoming connection as it starts the service. This only works for external tcp non-waiting servers and is an error if applied to an internal, udp, or tcp-wait server.
|
||||
+.TP
|
||||
.B REUSE
|
||||
The REUSE flag is deprecated. All services now implicitly use the REUSE flag.
|
||||
.RE
|
||||
|
|
@ -796,7 +796,7 @@ diff -Nurp xinetd-2.3.14-orig/xinetd/service.h xinetd-2.3.14-poll/xinetd/service
|
|||
+#endif
|
||||
|
||||
/*
|
||||
* $Id: service.h,v 1.5 2005/03/29 15:50:34 bbraun Exp $
|
||||
* $Id: service.h,v 1.6 2012-05-09 15:40:29 bbraun Exp $
|
||||
@@ -45,7 +48,13 @@ struct service
|
||||
state_e svc_state ;
|
||||
int svc_ref_count ; /* # of pters to this struct */
|
||||
|
|
|
|||
|
|
@ -1,660 +0,0 @@
|
|||
--- xinetd-2.3.14/libs/src/sio/impl.h.ssize_t 2006-10-27 12:33:29.000000000 -0400
|
||||
+++ xinetd-2.3.14/libs/src/sio/impl.h 2006-10-27 12:40:21.000000000 -0400
|
||||
@@ -142,9 +142,9 @@
|
||||
* Internal functions that are visible
|
||||
*/
|
||||
int __sio_writef( __sio_od_t *odp, int fd ) ;
|
||||
-int __sio_extend_buffer( __sio_id_t *idp, int fd, int b_left ) ;
|
||||
+ssize_t __sio_extend_buffer( __sio_id_t *idp, int fd, ssize_t b_left ) ;
|
||||
int __sio_init( __sio_descriptor_t *dp, int fd, enum __sio_stream stream_type );
|
||||
-int __sio_more( __sio_id_t *idp, int fd ) ;
|
||||
+ssize_t __sio_more( __sio_id_t *idp, int fd ) ;
|
||||
sio_status_e __sio_switch( __sio_id_t *idp, int fd ) ;
|
||||
|
||||
|
||||
--- xinetd-2.3.14/libs/src/sio/siosup.c.ssize_t 2003-09-06 10:41:59.000000000 -0400
|
||||
+++ xinetd-2.3.14/libs/src/sio/siosup.c 2006-10-27 12:40:23.000000000 -0400
|
||||
@@ -599,9 +599,9 @@
|
||||
* If it does not return SIO_ERR, it sets start, nextb, end
|
||||
* If it returns SIO_ERR, it does not change anything
|
||||
*/
|
||||
-static int __sio_readf( __sio_id_t *idp, int fd )
|
||||
+static ssize_t __sio_readf( __sio_id_t *idp, int fd )
|
||||
{
|
||||
- int cc ;
|
||||
+ ssize_t cc ;
|
||||
|
||||
/*
|
||||
* First check for a tied fd and flush the stream if necessary
|
||||
@@ -634,7 +634,7 @@
|
||||
{
|
||||
if ( __sio_switch( idp, fd ) == FAILURE )
|
||||
return( SIO_ERR ) ;
|
||||
- cc = -1 ;
|
||||
+ cc = (ssize_t)-1 ;
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -680,7 +680,7 @@
|
||||
for ( ;; )
|
||||
{
|
||||
cc = read( fd, idp->buf, (int) idp->buffer_size ) ;
|
||||
- if ( cc == -1 )
|
||||
+ if ( cc == (ssize_t)-1 )
|
||||
if ( errno == EINTR )
|
||||
continue ;
|
||||
else
|
||||
@@ -705,9 +705,9 @@
|
||||
* auxiliary buffer)
|
||||
* Also, if successful, idp->nextb is set to idp->buf, idp->end is modified.
|
||||
*/
|
||||
-int __sio_extend_buffer( __sio_id_t *idp, int fd, int b_left )
|
||||
+ssize_t __sio_extend_buffer( __sio_id_t *idp, int fd, ssize_t b_left )
|
||||
{
|
||||
- int b_read ;
|
||||
+ ssize_t b_read ;
|
||||
|
||||
/*
|
||||
* copy to auxiliary buffer
|
||||
@@ -733,10 +733,10 @@
|
||||
*
|
||||
* Return value: the number of bytes read.
|
||||
*/
|
||||
-int __sio_more( __sio_id_t *idp, int fd )
|
||||
+ssize_t __sio_more( __sio_id_t *idp, int fd )
|
||||
{
|
||||
int b_left = &idp->buf[ idp->buffer_size ] - idp->end ;
|
||||
- int cc ;
|
||||
+ ssize_t cc ;
|
||||
|
||||
if ( b_left <= 0 )
|
||||
return( 0 ) ;
|
||||
--- xinetd-2.3.14/libs/src/sio/sprint.c.ssize_t 2006-10-27 13:14:49.000000000 -0400
|
||||
+++ xinetd-2.3.14/libs/src/sio/sprint.c 2006-10-27 13:14:51.000000000 -0400
|
||||
@@ -18,7 +18,7 @@
|
||||
typedef unsigned long long u_wide_int ;
|
||||
typedef int bool_int ;
|
||||
|
||||
-static char *conv_10( wide_int num, bool_int is_unsigned, bool_int *is_negative, char *buf_end, int *len );
|
||||
+static char *conv_10( wide_int num, bool_int is_unsigned, bool_int *is_negative, char *buf_end, size_t *len );
|
||||
|
||||
#define S_NULL_LEN 6
|
||||
static char S_NULL[S_NULL_LEN+1] = "(null)";
|
||||
@@ -69,7 +69,7 @@
|
||||
} \
|
||||
if ( __SIO_MUST_FLUSH( *odp, c ) && fd >= 0 ) \
|
||||
{ \
|
||||
- int b_in_buffer = sp - odp->start ; \
|
||||
+ ssize_t b_in_buffer = sp - odp->start ; \
|
||||
\
|
||||
odp->nextb = sp ; \
|
||||
if ( __sio_writef( odp, fd ) != b_in_buffer ) \
|
||||
@@ -122,11 +122,11 @@
|
||||
* - all floating point arguments are passed as doubles
|
||||
*/
|
||||
/* VARARGS2 */
|
||||
-int Sprint( int fd, const char *fmt, ...)
|
||||
+ssize_t Sprint( int fd, const char *fmt, ...)
|
||||
{
|
||||
__sio_descriptor_t *dp ;
|
||||
__sio_od_t *odp ;
|
||||
- int cc ;
|
||||
+ ssize_t cc ;
|
||||
va_list ap ;
|
||||
|
||||
if( sio_setup( fd, &dp, __SIO_OUTPUT_STREAM ) == SIO_ERR )
|
||||
@@ -143,7 +143,7 @@
|
||||
/*
|
||||
* This is the equivalent of vfprintf for SIO
|
||||
*/
|
||||
-int Sprintv( int fd, const char *fmt, va_list ap)
|
||||
+ssize_t Sprintv( int fd, const char *fmt, va_list ap)
|
||||
{
|
||||
__sio_descriptor_t *dp ;
|
||||
__sio_od_t *odp ;
|
||||
@@ -162,7 +162,7 @@
|
||||
* in buf).
|
||||
*/
|
||||
static char *conv_fp( char format, double num, boolean_e add_dp,
|
||||
- int precision, bool_int *is_negative, char buf[], int *len )
|
||||
+ size_t precision, bool_int *is_negative, char buf[], size_t *len )
|
||||
/* always add decimal point if YES */
|
||||
{
|
||||
char *s = buf ;
|
||||
@@ -220,7 +220,7 @@
|
||||
if ( format != 'f' )
|
||||
{
|
||||
char temp[ EXPONENT_LENGTH ] ; /* for exponent conversion */
|
||||
- int t_len ;
|
||||
+ size_t t_len ;
|
||||
bool_int exponent_is_negative ;
|
||||
|
||||
*s++ = format ; /* either e or E */
|
||||
@@ -261,7 +261,7 @@
|
||||
* which is a pointer to the END of the buffer + 1 (i.e. if the buffer
|
||||
* is declared as buf[ 100 ], buf_end should be &buf[ 100 ])
|
||||
*/
|
||||
-static char *conv_p2( u_wide_int num, int nbits, char format, char *buf_end, int *len )
|
||||
+static char *conv_p2( u_wide_int num, int nbits, char format, char *buf_end, size_t *len )
|
||||
{
|
||||
int mask = ( 1 << nbits ) - 1 ;
|
||||
char *p = buf_end ;
|
||||
@@ -292,7 +292,7 @@
|
||||
* which is a pointer to the END of the buffer + 1 (i.e. if the buffer
|
||||
* is declared as buf[ 100 ], buf_end should be &buf[ 100 ])
|
||||
*/
|
||||
-static char *conv_10( wide_int num, bool_int is_unsigned, bool_int *is_negative, char *buf_end, int *len )
|
||||
+static char *conv_10( wide_int num, bool_int is_unsigned, bool_int *is_negative, char *buf_end, size_t *len )
|
||||
{
|
||||
char *p = buf_end ;
|
||||
u_wide_int magnitude ;
|
||||
@@ -346,19 +346,19 @@
|
||||
* Do format conversion placing the output in odp.
|
||||
* Note: we do not support %n for security reasons.
|
||||
*/
|
||||
-int __sio_converter( __sio_od_t *odp, int fd, const char *fmt, va_list ap )
|
||||
+ssize_t __sio_converter( __sio_od_t *odp, int fd, const char *fmt, va_list ap )
|
||||
{
|
||||
char *sp = NULL;
|
||||
char *bep = NULL;
|
||||
- int cc = 0 ;
|
||||
- int i ;
|
||||
+ ssize_t cc = 0 ;
|
||||
+ size_t i ;
|
||||
|
||||
char *s = NULL;
|
||||
char *q = NULL;
|
||||
- int s_len ;
|
||||
+ size_t s_len ;
|
||||
|
||||
int min_width = 0 ;
|
||||
- int precision = 0 ;
|
||||
+ size_t precision = 0 ;
|
||||
enum { LEFT, RIGHT } adjust ;
|
||||
char pad_char ;
|
||||
char prefix_char ;
|
||||
--- xinetd-2.3.14/libs/src/sio/sio.c.ssize_t 2006-10-27 12:35:12.000000000 -0400
|
||||
+++ xinetd-2.3.14/libs/src/sio/sio.c 2006-10-27 13:28:09.000000000 -0400
|
||||
@@ -28,17 +28,17 @@
|
||||
/*
|
||||
* Stream write call: arguments same as those of write(2)
|
||||
*/
|
||||
-int Swrite( int fd, const char *addr, unsigned int nbytes )
|
||||
+ssize_t Swrite( int fd, const char *addr, size_t nbytes )
|
||||
{
|
||||
__sio_descriptor_t *dp ;
|
||||
__sio_od_t *odp ;
|
||||
- unsigned int b_transferred ;
|
||||
- unsigned int b_avail ;
|
||||
- int total_b_transferred ;
|
||||
- int b_written ;
|
||||
- int b_in_buffer ;
|
||||
+ size_t b_transferred ;
|
||||
+ size_t b_avail ;
|
||||
+ ssize_t total_b_transferred ;
|
||||
+ ssize_t b_written ;
|
||||
+ ssize_t b_in_buffer ;
|
||||
|
||||
- if ( nbytes > INT_MAX )
|
||||
+ if ( nbytes > SSIZE_MAX )
|
||||
return( SIO_ERR );
|
||||
if( sio_setup( fd, &dp, __SIO_OUTPUT_STREAM ) == SIO_ERR )
|
||||
return( SIO_ERR );
|
||||
@@ -62,7 +62,7 @@
|
||||
b_in_buffer = odp->buf_end - odp->start ;
|
||||
b_written = __sio_writef( odp, fd ) ;
|
||||
if ( b_written != b_in_buffer )
|
||||
- return( (b_written >= (int)nbytes) ? (int)nbytes : b_written ) ;
|
||||
+ return( (b_written >= (ssize_t)nbytes) ? (ssize_t)nbytes : b_written ) ;
|
||||
|
||||
total_b_transferred = b_transferred ;
|
||||
addr += b_transferred ;
|
||||
@@ -83,7 +83,7 @@
|
||||
* the buffer is full
|
||||
*/
|
||||
b_written = __sio_writef( odp, fd ) ;
|
||||
- if ( b_written != (int)odp->buffer_size )
|
||||
+ if ( b_written != (ssize_t)odp->buffer_size )
|
||||
{
|
||||
if ( b_written != SIO_ERR )
|
||||
{
|
||||
@@ -157,8 +157,8 @@
|
||||
__sio_id_t *idp ;
|
||||
char *cp ;
|
||||
char *line_start ;
|
||||
- int b_left ;
|
||||
- int extension ;
|
||||
+ ssize_t b_left ;
|
||||
+ ssize_t extension ;
|
||||
|
||||
if( sio_setup( fd, &dp, __SIO_INPUT_STREAM ) == SIO_ERR )
|
||||
return( NULL );
|
||||
@@ -361,7 +361,7 @@
|
||||
|
||||
#ifndef sio_memscan
|
||||
|
||||
-static char *sio_memscan( const char *from, int how_many, char ch )
|
||||
+static char *sio_memscan( const char *from, size_t how_many, char ch )
|
||||
{
|
||||
char *p ;
|
||||
char *last = from + how_many ;
|
||||
@@ -377,7 +377,7 @@
|
||||
|
||||
#ifdef NEED_MEMCOPY
|
||||
|
||||
-void __sio_memcopy( const char *from, char *to, int nbytes )
|
||||
+void __sio_memcopy( const char *from, char *to, size_t nbytes )
|
||||
{
|
||||
while ( nbytes-- )
|
||||
*to++ = *from++ ;
|
||||
--- xinetd-2.3.14/xinetd/udpint.c.ssize_t 2005-10-05 13:20:11.000000000 -0400
|
||||
+++ xinetd-2.3.14/xinetd/udpint.c 2006-10-27 12:17:10.000000000 -0400
|
||||
@@ -226,7 +226,7 @@
|
||||
{
|
||||
char *p ;
|
||||
int left ;
|
||||
- int cc ;
|
||||
+ ssize_t cc ;
|
||||
const char *func = "send_data" ;
|
||||
|
||||
for ( p = buf, left = len ; left > 0 ; left -= cc, p+= cc )
|
||||
@@ -236,7 +236,7 @@
|
||||
else
|
||||
cc = sendto( sd, p, left, 0, SA( addr ), sizeof( *addr ) ) ;
|
||||
|
||||
- if ( cc == -1 ) {
|
||||
+ if ( cc == (ssize_t)-1 ) {
|
||||
if ( errno == EINTR )
|
||||
{
|
||||
cc = 0 ;
|
||||
@@ -264,12 +264,12 @@
|
||||
|
||||
for ( ;; )
|
||||
{
|
||||
- int cc ;
|
||||
+ ssize_t cc ;
|
||||
|
||||
from_len = sizeof( pp->from ) ;
|
||||
cc = recvfrom( INT_REMOTE( ip ), pp->data, pp->size,
|
||||
0, SA( &pp->from ), &from_len ) ;
|
||||
- if ( cc == -1 )
|
||||
+ if ( cc == (ssize_t)-1 )
|
||||
{
|
||||
if ( errno != EINTR )
|
||||
{
|
||||
@@ -306,14 +306,14 @@
|
||||
static status_e udp_local_to_remote( channel_s *chp )
|
||||
{
|
||||
char buf[ MAX_DATAGRAM_SIZE ] ;
|
||||
- int cc ;
|
||||
+ ssize_t cc ;
|
||||
const char *func = "udp_local_to_remote" ;
|
||||
|
||||
for ( ;; )
|
||||
{
|
||||
cc = recv( chp->ch_local_socket, buf, sizeof( buf ), 0 ) ;
|
||||
|
||||
- if ( cc == -1 )
|
||||
+ if ( cc == (ssize_t)-1 )
|
||||
{
|
||||
if ( errno != EINTR )
|
||||
{
|
||||
--- xinetd-2.3.14/xinetd/service.c.ssize_t 2006-10-27 12:17:10.000000000 -0400
|
||||
+++ xinetd-2.3.14/xinetd/service.c 2006-10-27 12:17:10.000000000 -0400
|
||||
@@ -610,7 +610,7 @@
|
||||
/* print the banner regardless of access control */
|
||||
if ( SC_BANNER(scp) != NULL ) {
|
||||
char tmpbuf[TMPSIZE];
|
||||
- int retval;
|
||||
+ ssize_t retval;
|
||||
int bannerfd = open(SC_BANNER(scp), O_RDONLY);
|
||||
|
||||
if( bannerfd < 0 ) {
|
||||
@@ -620,7 +620,7 @@
|
||||
}
|
||||
|
||||
while( (retval = read(bannerfd, tmpbuf, sizeof(tmpbuf))) ) {
|
||||
- if (retval == -1)
|
||||
+ if (retval == (ssize_t)-1)
|
||||
{
|
||||
if (errno == EINTR)
|
||||
continue;
|
||||
--- xinetd-2.3.14/xinetd/signals.c.ssize_t 2003-12-23 10:30:10.000000000 -0500
|
||||
+++ xinetd-2.3.14/xinetd/signals.c 2006-10-27 12:17:10.000000000 -0400
|
||||
@@ -402,7 +402,7 @@
|
||||
*/
|
||||
static void my_handler( int sig )
|
||||
{
|
||||
- int ret_val;
|
||||
+ ssize_t ret_val;
|
||||
int saved_errno = errno;
|
||||
#if NSIG < 256
|
||||
unsigned char sig_byte;
|
||||
@@ -412,13 +412,13 @@
|
||||
do
|
||||
{
|
||||
ret_val = write(signals_pending[1], &sig_byte, 1);
|
||||
- } while (ret_val == -1 && errno == EINTR);
|
||||
+ } while (ret_val == (ssize_t)-1 && errno == EINTR);
|
||||
#else
|
||||
if (signals_pending[1] < 0) return;
|
||||
do
|
||||
{
|
||||
ret_val = write(signals_pending[1], &sig, sizeof(int));
|
||||
- } while (ret_val == -1 && errno == EINTR);
|
||||
+ } while (ret_val == (ssize_t)-1 && errno == EINTR);
|
||||
#endif
|
||||
errno = saved_errno;
|
||||
}
|
||||
@@ -470,12 +470,12 @@
|
||||
#endif
|
||||
|
||||
while( --i >= 0 ) {
|
||||
- int ret_val;
|
||||
+ ssize_t ret_val;
|
||||
do
|
||||
{
|
||||
ret_val = read(signals_pending[0], &sig, sizeof(sig));
|
||||
- } while (ret_val == -1 && errno == EINTR);
|
||||
- if (ret_val != sizeof(sig) ) {
|
||||
+ } while (ret_val == (ssize_t)-1 && errno == EINTR);
|
||||
+ if (ret_val != (ssize_t)sizeof(sig) ) {
|
||||
msg(LOG_ERR, func, "Error retrieving pending signal: %m");
|
||||
return;
|
||||
}
|
||||
--- xinetd-2.3.14/xinetd/connection.c.ssize_t 2005-10-05 13:20:11.000000000 -0400
|
||||
+++ xinetd-2.3.14/xinetd/connection.c 2006-10-27 12:17:10.000000000 -0400
|
||||
@@ -96,13 +96,15 @@
|
||||
if ( SVC_SOCKET_TYPE( sp ) == SOCK_DGRAM )
|
||||
{
|
||||
char t_ch ;
|
||||
+ ssize_t val;
|
||||
|
||||
/*
|
||||
* This trick is done to get the remote address.
|
||||
* select(2) guaranteed that we won't block on the recvfrom
|
||||
*/
|
||||
- if ( recvfrom( SVC_FD( sp ), &t_ch, 1, MSG_PEEK,
|
||||
- &cp->co_remote_address.sa, &sin_len ) == -1 )
|
||||
+ val = recvfrom( SVC_FD( sp ), &t_ch, 1, MSG_PEEK,
|
||||
+ &cp->co_remote_address.sa, &sin_len );
|
||||
+ if ( val == (ssize_t)-1 )
|
||||
{
|
||||
msg( LOG_ERR, func, "service %s, recvfrom: %m", SVC_ID( sp ) ) ;
|
||||
return( FAILED ) ;
|
||||
--- xinetd-2.3.14/xinetd/util.c.ssize_t 2005-10-05 17:45:41.000000000 -0400
|
||||
+++ xinetd-2.3.14/xinetd/util.c 2006-10-27 12:17:10.000000000 -0400
|
||||
@@ -198,7 +198,8 @@
|
||||
*/
|
||||
status_e write_buf( int fd, const char *buf, int len )
|
||||
{
|
||||
- int cc, i ;
|
||||
+ int i ;
|
||||
+ ssize_t cc;
|
||||
|
||||
for ( i = 0 ; len > 0 ; i += cc, len -= cc )
|
||||
{
|
||||
@@ -234,7 +235,7 @@
|
||||
void drain( int sd )
|
||||
{
|
||||
char buf[ 256 ] ; /* This size is arbitrarily chosen */
|
||||
- int ret ;
|
||||
+ ssize_t ret ;
|
||||
int old_val ;
|
||||
|
||||
/* Put in non-blocking mode so we don't hang. */
|
||||
--- xinetd-2.3.14/xinetd/redirect.c.ssize_t 2003-08-06 02:12:10.000000000 -0400
|
||||
+++ xinetd-2.3.14/xinetd/redirect.c 2006-10-27 12:17:10.000000000 -0400
|
||||
@@ -58,7 +58,8 @@
|
||||
struct service *sp = SERVER_SERVICE( serp );
|
||||
struct service_config *scp = SVC_CONF( sp );
|
||||
int RedirDescrip = SERVER_FD( serp );
|
||||
- int maxfd, num_read, num_wrote=0, ret=0;
|
||||
+ int maxfd;
|
||||
+ ssize_t num_read, num_wrote=0, ret=0;
|
||||
unsigned int sin_len = 0;
|
||||
unsigned long bytes_in = 0, bytes_out = 0;
|
||||
int no_to_nagle = 1;
|
||||
@@ -156,7 +157,7 @@
|
||||
do {
|
||||
num_read = read(RedirDescrip,
|
||||
buff, sizeof(buff));
|
||||
- if (num_read == -1 && errno == EINTR)
|
||||
+ if (num_read == (ssize_t)-1 && errno == EINTR)
|
||||
continue;
|
||||
if (num_read <= 0)
|
||||
goto REDIROUT;
|
||||
--- xinetd-2.3.14/xinetd/tcpint.c.ssize_t 2005-10-05 13:20:11.000000000 -0400
|
||||
+++ xinetd-2.3.14/xinetd/tcpint.c 2006-10-27 12:17:10.000000000 -0400
|
||||
@@ -273,7 +273,7 @@
|
||||
static stream_status_e tcp_local_to_remote( channel_s *chp )
|
||||
{
|
||||
char buf[ DATAGRAM_SIZE ] ;
|
||||
- int rcc, wcc ;
|
||||
+ ssize_t rcc, wcc ;
|
||||
char *p ;
|
||||
int left ;
|
||||
const char *func = "tcp_local_to_remote" ;
|
||||
@@ -283,7 +283,7 @@
|
||||
rcc = recv( chp->ch_local_socket, buf, sizeof( buf ), 0 ) ;
|
||||
if ( rcc == 0 )
|
||||
return( S_SERVER_ERR ) ;
|
||||
- else if ( rcc == -1 )
|
||||
+ else if ( rcc == (ssize_t)-1 )
|
||||
{
|
||||
if ( errno != EINTR )
|
||||
{
|
||||
@@ -300,7 +300,7 @@
|
||||
wcc = send( chp->ch_remote_socket, p, left, 0 ) ;
|
||||
if ( wcc == 0 )
|
||||
return( S_CLIENT_ERR ) ;
|
||||
- else if ( wcc == -1 )
|
||||
+ else if ( wcc == (ssize_t)-1 )
|
||||
{
|
||||
if ( errno == EINTR )
|
||||
wcc = 0 ;
|
||||
@@ -326,7 +326,7 @@
|
||||
static stream_status_e tcp_remote_to_local( channel_s *chp )
|
||||
{
|
||||
char buf[ DATAGRAM_SIZE ] ;
|
||||
- int rcc, wcc ;
|
||||
+ ssize_t rcc, wcc ;
|
||||
int left ;
|
||||
char *p ;
|
||||
const char *func = "tcp_remote_to_local" ;
|
||||
@@ -336,7 +336,7 @@
|
||||
rcc = recv( chp->ch_remote_socket, buf, sizeof( buf ), 0 ) ;
|
||||
if ( rcc == 0 )
|
||||
return( S_CLIENT_ERR ) ;
|
||||
- else if ( rcc == -1 )
|
||||
+ else if ( rcc == (ssize_t)-1 )
|
||||
{
|
||||
if ( errno != EINTR )
|
||||
{
|
||||
@@ -353,7 +353,7 @@
|
||||
wcc = send( chp->ch_local_socket, p, left, 0 ) ;
|
||||
if ( wcc == 0 ) {
|
||||
return( S_SERVER_ERR ) ;
|
||||
- } else if ( wcc == -1 ) {
|
||||
+ } else if ( wcc == (ssize_t)-1 ) {
|
||||
if ( errno == EINTR ) {
|
||||
rcc = 0 ;
|
||||
} else {
|
||||
--- xinetd-2.3.14/xinetd/builtins.c.ssize_t 2005-10-06 11:38:04.000000000 -0400
|
||||
+++ xinetd-2.3.14/xinetd/builtins.c 2006-10-27 12:17:10.000000000 -0400
|
||||
@@ -129,7 +129,7 @@
|
||||
static void stream_echo( const struct server *serp )
|
||||
{
|
||||
char buf[ BUFFER_SIZE ] ;
|
||||
- int cc ;
|
||||
+ ssize_t cc ;
|
||||
int descriptor = SERVER_FD( serp ) ;
|
||||
struct service *svc = SERVER_SERVICE( serp ) ;;
|
||||
|
||||
@@ -149,7 +149,7 @@
|
||||
cc = read( descriptor, buf, sizeof( buf ) ) ;
|
||||
if ( cc == 0 )
|
||||
break ;
|
||||
- if ( cc == -1 ) {
|
||||
+ if ( cc == (ssize_t)-1 ) {
|
||||
if ( errno == EINTR )
|
||||
continue ;
|
||||
else
|
||||
@@ -167,7 +167,7 @@
|
||||
{
|
||||
char buf[ DATAGRAM_SIZE ] ;
|
||||
union xsockaddr lsin;
|
||||
- int cc ;
|
||||
+ ssize_t cc ;
|
||||
socklen_t sin_len = 0;
|
||||
int descriptor = SERVER_FD( serp ) ;
|
||||
const char *func = "dgram_echo";
|
||||
@@ -178,15 +178,15 @@
|
||||
sin_len = sizeof( struct sockaddr_in6 );
|
||||
|
||||
cc = recvfrom( descriptor, buf, sizeof( buf ), 0, SA( &lsin ), &sin_len ) ;
|
||||
- if ( cc != -1 ) {
|
||||
- (void) sendto( descriptor, buf, cc, 0, SA( &lsin ), sizeof( lsin ) ) ;
|
||||
+ if ( cc != (ssize_t)-1 ) {
|
||||
+ (void) sendto( descriptor, buf, (size_t)cc, 0, SA( &lsin ), sizeof( lsin ) ) ;
|
||||
}
|
||||
}
|
||||
|
||||
static void stream_discard( const struct server *serp )
|
||||
{
|
||||
char buf[ BUFFER_SIZE ] ;
|
||||
- int cc ;
|
||||
+ ssize_t cc ;
|
||||
int descriptor = SERVER_FD( serp ) ;
|
||||
struct service *svc = SERVER_SERVICE( serp ) ;;
|
||||
|
||||
@@ -204,7 +204,7 @@
|
||||
for ( ;; )
|
||||
{
|
||||
cc = read( descriptor, buf, sizeof( buf ) ) ;
|
||||
- if ( (cc == 0) || ((cc == -1) && (errno != EINTR)) )
|
||||
+ if ( (cc == 0) || ((cc == (ssize_t)-1) && (errno != EINTR)) )
|
||||
break ;
|
||||
}
|
||||
if( SVC_WAITS( svc ) ) /* Service forks, so close it */
|
||||
@@ -293,14 +293,16 @@
|
||||
unsigned int buflen = sizeof( time_buf ) ;
|
||||
int descriptor = SERVER_FD( serp ) ;
|
||||
const char *func = "dgram_daytime";
|
||||
+ ssize_t val;
|
||||
|
||||
if ( SC_IPV4( SVC_CONF( SERVER_SERVICE( serp ) ) ) )
|
||||
sin_len = sizeof( struct sockaddr_in );
|
||||
else if ( SC_IPV6( SVC_CONF( SERVER_SERVICE( serp ) ) ) )
|
||||
sin_len = sizeof( struct sockaddr_in6 );
|
||||
|
||||
- if ( recvfrom( descriptor, time_buf, sizeof( time_buf ), 0,
|
||||
- SA( &lsin ), &sin_len ) == -1 )
|
||||
+ val = recvfrom( descriptor, time_buf, sizeof( time_buf ), 0,
|
||||
+ SA( &lsin ), &sin_len );
|
||||
+ if ( val == (ssize_t)-1 )
|
||||
return ;
|
||||
|
||||
daytime_protocol( time_buf, &buflen ) ;
|
||||
@@ -359,13 +361,15 @@
|
||||
socklen_t sin_len = 0 ;
|
||||
int fd = SERVER_FD( serp ) ;
|
||||
const char *func = "dgram_daytime";
|
||||
+ ssize_t val;
|
||||
|
||||
if ( SC_IPV4( SVC_CONF( SERVER_SERVICE( serp ) ) ) )
|
||||
sin_len = sizeof( struct sockaddr_in );
|
||||
else if ( SC_IPV6( SVC_CONF( SERVER_SERVICE( serp ) ) ) )
|
||||
sin_len = sizeof( struct sockaddr_in6 );
|
||||
|
||||
- if ( recvfrom( fd, buf, sizeof( buf ), 0, SA( &lsin ), &sin_len ) == -1 )
|
||||
+ val = recvfrom( fd, buf, sizeof( buf ), 0, SA( &lsin ), &sin_len );
|
||||
+ if ( val == (ssize_t)-1 )
|
||||
return ;
|
||||
|
||||
time_protocol( time_buf ) ;
|
||||
@@ -465,13 +469,15 @@
|
||||
int fd = SERVER_FD( serp ) ;
|
||||
unsigned int left = sizeof( buf ) ;
|
||||
const char *func = "dgram_chargen";
|
||||
+ ssize_t val;
|
||||
|
||||
if ( SC_IPV4( SVC_CONF( SERVER_SERVICE( serp ) ) ) )
|
||||
sin_len = sizeof( struct sockaddr_in );
|
||||
else if ( SC_IPV6( SVC_CONF( SERVER_SERVICE( serp ) ) ) )
|
||||
sin_len = sizeof( struct sockaddr_in6 );
|
||||
|
||||
- if ( recvfrom( fd, buf, sizeof( buf ), 0, SA( &lsin ), &sin_len ) == -1 )
|
||||
+ val = recvfrom( fd, buf, sizeof( buf ), 0, SA( &lsin ), &sin_len );
|
||||
+ if ( val == (ssize_t)-1 )
|
||||
return ;
|
||||
|
||||
#if BUFFER_SIZE < LINE_LENGTH+2
|
||||
--- xinetd-2.3.14/xinetd/ident.c.ssize_t 2005-10-05 13:20:11.000000000 -0400
|
||||
+++ xinetd-2.3.14/xinetd/ident.c 2006-10-27 12:17:10.000000000 -0400
|
||||
@@ -267,7 +267,7 @@
|
||||
static char *get_line( int sd, char *buf, unsigned bufsize )
|
||||
{
|
||||
int size ;
|
||||
- int cc ;
|
||||
+ ssize_t cc ;
|
||||
char *p ;
|
||||
char *s ;
|
||||
const char *func = "get_line" ;
|
||||
@@ -275,7 +275,7 @@
|
||||
for ( p = buf, size = bufsize ; size > 0 ; p += cc, size -= cc )
|
||||
{
|
||||
cc = read( sd, p, size ) ;
|
||||
- if ( cc == -1 ) {
|
||||
+ if ( cc == (ssize_t)-1 ) {
|
||||
if ( errno == EINTR )
|
||||
{
|
||||
cc = 0 ;
|
||||
--- xinetd-2.3.14/libs/src/sio/sio.h.ssize_t 2003-06-10 09:15:44.000000000 -0400
|
||||
+++ xinetd-2.3.14/libs/src/sio/sio.h 2006-10-27 15:47:37.000000000 -0400
|
||||
@@ -12,6 +12,8 @@
|
||||
#define __SIO_H
|
||||
|
||||
#include <errno.h>
|
||||
+#include <string.h>
|
||||
+#include <unistd.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
/*
|
||||
@@ -56,7 +58,7 @@
|
||||
* buffer is right below buf and is of the same size.
|
||||
*/
|
||||
char *buf ;
|
||||
- unsigned buffer_size ;
|
||||
+ size_t buffer_size ;
|
||||
|
||||
char *start ; /* start of valid buffer contents */
|
||||
char *end ; /* end of valid buffer contents + 1 */
|
||||
@@ -163,15 +165,15 @@
|
||||
/*
|
||||
* The Write functions
|
||||
*/
|
||||
-int Swrite ( int fd, const char *buf, unsigned int nbytes );
|
||||
-int Sprint ( int fd, const char *format, ... )
|
||||
+ssize_t Swrite ( int fd, const char *buf, size_t );
|
||||
+ssize_t Sprint ( int fd, const char *format, ... )
|
||||
#ifdef __GNUC__
|
||||
__attribute__ ((format (printf, 2, 3)));
|
||||
#else
|
||||
;
|
||||
#endif
|
||||
int Sputchar( int fd, char c );
|
||||
-int Sprintv ( int fd, const char *format, va_list ap )
|
||||
+ssize_t Sprintv ( int fd, const char *format, va_list ap )
|
||||
#ifdef __GNUC__
|
||||
__attribute__ ((format (printf, 2, 0)));
|
||||
#else
|
||||
@@ -186,7 +188,7 @@
|
||||
int Sclose ( int fd ) ;
|
||||
int Sbuftype ( int fd, int type ) ;
|
||||
int Smorefds ( int ) ;
|
||||
-int __sio_converter( __sio_od_t *, int , const char *, va_list );
|
||||
+ssize_t __sio_converter( __sio_od_t *, int , const char *, va_list );
|
||||
int sio_setup(int fd, __sio_descriptor_t **dp, unsigned int type );
|
||||
|
||||
#ifdef __GNUC__
|
||||
22
xinetd-2.3.15-PIE.patch
Normal file
22
xinetd-2.3.15-PIE.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
--- xinetd-2.3.15/Makefile.in 2012-05-14 09:22:22.661617117 +0200
|
||||
+++ xinetd-2.3.15.new/Makefile.in 2012-05-14 09:32:05.260103054 +0200
|
||||
@@ -14,7 +14,7 @@ topdir = @top_srcdir@
|
||||
|
||||
LIBS = -lsio -lstr -lmisc -lxlog -lportable -lpset @LIBS@
|
||||
|
||||
-CFLAGS += @CFLAGS@
|
||||
+CFLAGS += @CFLAGS@ -fPIE
|
||||
DCFLAGS = -Wall -Wredundant-decls -W -Wfloat-equal -Wundef -Wcast-qual -Wwrite-strings -Wmissing-noreturn -Wmissing-format-attribute -Wshadow -Wpointer-arith -Wno-unused -g
|
||||
|
||||
|
||||
--- xinetd-2.3.15/xinetd/Makefile.in 2005-03-31 01:15:28.000000000 +0200
|
||||
+++ xinetd-2.3.15.new/xinetd/Makefile.in 2012-05-14 09:32:24.183659971 +0200
|
||||
@@ -119,7 +119,7 @@ itox: itox.c
|
||||
$(CC) $(CFLAGS) $(DEBUG) $(SRCDIR)/itox.c -o $@ $(LDFLAGS) $(LIBS)
|
||||
|
||||
xinetd: $(OBJS)
|
||||
- $(CC) $(CFLAGS) $(DEBUG) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) || rm -f $@
|
||||
+ $(CC) $(CFLAGS) $(DEBUG) -o $@ -PIE $(OBJS) $(LDFLAGS) $(LIBS) || rm -f $@
|
||||
|
||||
clean:
|
||||
rm -f $(OBJS) $(NAME) core itox
|
||||
22
xinetd-2.3.15-pie.patch
Normal file
22
xinetd-2.3.15-pie.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
--- xinetd-2.3.15/Makefile.in 2012-05-14 09:22:22.661617117 +0200
|
||||
+++ xinetd-2.3.15.new/Makefile.in 2012-05-14 09:32:05.260103054 +0200
|
||||
@@ -14,7 +14,7 @@ topdir = @top_srcdir@
|
||||
|
||||
LIBS = -lsio -lstr -lmisc -lxlog -lportable -lpset @LIBS@
|
||||
|
||||
-CFLAGS += @CFLAGS@
|
||||
+CFLAGS += @CFLAGS@ -fpie
|
||||
DCFLAGS = -Wall -Wredundant-decls -W -Wfloat-equal -Wundef -Wcast-qual -Wwrite-strings -Wmissing-noreturn -Wmissing-format-attribute -Wshadow -Wpointer-arith -Wno-unused -g
|
||||
|
||||
|
||||
--- xinetd-2.3.15/xinetd/Makefile.in 2005-03-31 01:15:28.000000000 +0200
|
||||
+++ xinetd-2.3.15.new/xinetd/Makefile.in 2012-05-14 09:32:24.183659971 +0200
|
||||
@@ -119,7 +119,7 @@ itox: itox.c
|
||||
$(CC) $(CFLAGS) $(DEBUG) $(SRCDIR)/itox.c -o $@ $(LDFLAGS) $(LIBS)
|
||||
|
||||
xinetd: $(OBJS)
|
||||
- $(CC) $(CFLAGS) $(DEBUG) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) || rm -f $@
|
||||
+ $(CC) $(CFLAGS) $(DEBUG) -o $@ -pie $(OBJS) $(LDFLAGS) $(LIBS) || rm -f $@
|
||||
|
||||
clean:
|
||||
rm -f $(OBJS) $(NAME) core itox
|
||||
29
xinetd.spec
29
xinetd.spec
|
|
@ -1,7 +1,7 @@
|
|||
Summary: A secure replacement for inetd
|
||||
Name: xinetd
|
||||
Version: 2.3.14
|
||||
Release: 46%{?dist}
|
||||
Version: 2.3.15
|
||||
Release: 1%{?dist}
|
||||
License: xinetd
|
||||
Group: System Environment/Daemons
|
||||
Epoch: 2
|
||||
|
|
@ -9,14 +9,10 @@ URL: http://www.xinetd.org
|
|||
Source: http://www.xinetd.org/xinetd-%{version}.tar.gz
|
||||
Source1: xinetd.service
|
||||
Source3: xinetd.sysconf
|
||||
Patch0: xinetd-2.3.11-pie.patch
|
||||
Patch1: xinetd-2.3.12-tcp_rpc.patch
|
||||
Patch2: xinetd-2.3.14-label.patch
|
||||
Patch3: xinetd-2.3.14-contextconf.patch
|
||||
Patch0: xinetd-2.3.15-pie.patch
|
||||
Patch4: xinetd-2.3.14-bind-ipv6.patch
|
||||
Patch5: xinetd-2.3.14-ssize_t.patch
|
||||
Patch6: xinetd-2.3.14-man-section.patch
|
||||
Patch7: xinetd-2.3.11-PIE.patch
|
||||
Patch7: xinetd-2.3.15-PIE.patch
|
||||
Patch8: xinetd-2.3.14-ident-bind.patch
|
||||
Patch9: xinetd-2.3.14-readable-debuginfo.patch
|
||||
# Patch for clean reconfiguration using newer versions of autotools
|
||||
|
|
@ -39,7 +35,6 @@ 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
|
||||
Patch17: xinetd-2.3.13-log-crash.patch
|
||||
Patch18: xinetd-2.3.14-rpc-specific-port.patch
|
||||
Patch19: xinetd-2.3.14-signal-log-hang.patch
|
||||
Patch20: xinetd-2.3.14-fix-type-punned-ptr.patch
|
||||
|
|
@ -86,15 +81,11 @@ located in the /etc/xinetd.d directory.
|
|||
# SPARC/SPARC64 needs -fPIE/-PIE
|
||||
# This really should be detected by configure.
|
||||
%ifarch sparcv9 sparc64
|
||||
%patch7 -p0 -b .PIE
|
||||
%patch7 -p1 -b .PIE
|
||||
%else
|
||||
%patch0 -p0 -b .pie
|
||||
%patch0 -p1 -b .pie
|
||||
%endif
|
||||
%patch1 -p1 -b .tcp_rpc
|
||||
%patch2 -p1 -b .lspp
|
||||
%patch3 -p1 -b .confcntx
|
||||
%patch4 -p1 -b .bind
|
||||
%patch5 -p1 -b .ssize_t
|
||||
%patch6 -p1 -b .man-section
|
||||
%patch8 -p1 -b .ident-bind
|
||||
%patch9 -p1 -b .readable-debuginfo
|
||||
|
|
@ -105,7 +96,6 @@ located in the /etc/xinetd.d directory.
|
|||
%patch14 -p1 -b .clean-pfd
|
||||
%patch15 -p1 -b .ipv6confusion
|
||||
%patch16 -p1 -b .udp-reconfig
|
||||
%patch17 -p1 -b .log-crash
|
||||
%patch18 -p1 -b .rpc-specific-port
|
||||
%patch19 -p1 -b .signal-log-hang
|
||||
%patch20 -p1 -b .fix-type-punned-ptr
|
||||
|
|
@ -184,6 +174,13 @@ fi
|
|||
%{_mandir}/*/*
|
||||
|
||||
%changelog
|
||||
* Mon May 14 2012 Jan Synáček <jsynacek@redhat.com> - 2:2.3.15-1
|
||||
- Update to 2.3.15
|
||||
- Drop patches merged by upstream
|
||||
(-log-crash, -tcp_rpc, -label, -contextconf, -ssize_t)
|
||||
- Update -pie, -PIE, -poll patch
|
||||
- Resolves: #820927
|
||||
|
||||
* Fri Apr 13 2012 Jan Synáček <jsynacek@redhat.com> - 2:2.3.14-46
|
||||
- Fix: service file: avoid problems when name resolution is not ready
|
||||
- Resolves: #748931
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue