packages: xinetd/xinetd.inet.sh - redirect doesn't need daemon/server

[arekm]

Author: arekm                        Date: Thu Oct 27 17:32:34 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- redirect doesn't need daemon/server

---- Files affected:
packages/xinetd:
   xinetd.inet.sh (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: packages/xinetd/xinetd.inet.sh
diff -u packages/xinetd/xinetd.inet.sh:1.17 packages/xinetd/xinetd.inet.sh:1.18
--- packages/xinetd/xinetd.inet.sh:1.17	Tue Aug 24 17:24:45 2010
+++ packages/xinetd/xinetd.inet.sh	Thu Oct 27 19:32:20 2011
@@ -25,10 +25,12 @@
 	if [ "${RPCNAME:-not}" = "not" ]; then
 		[ "${PORT:-not}" = "not" ]	&& ERROR_CODE=13
 	fi
+	if [ -z "${REDIRECT}" ]; then
+		[ "${SERVER:-not}" = "not" ]	&& ERROR_CODE=15
+		[ "${DAEMON:-not}" = "not" ]	&& ERROR_CODE=17
+	fi
 	[ "${USER:-not}" = "not" ]		&& ERROR_CODE=14
-	[ "${SERVER:-not}" = "not" ]		&& ERROR_CODE=15
 	[ "${FLAGS:-not}" = "not" ]		&& ERROR_CODE=16
-	[ "${DAEMON:-not}" = "not" ]		&& ERROR_CODE=17
 	[ "${SOCK_TYPE:-not}" = "not" ]		&& ERROR_CODE=18
 
 	if [ ! $ERROR_CODE -eq 0 ]; then
@@ -83,13 +85,14 @@
 	[ "${GROUP:-n}" = "n" ] || echo "	group		= $GROUP"
 		if [ "$SERVER" = "tcpd" ]; then
 			SERVER="$DAEMON"
-		else
+		elif [ -z "$REDIRECT" ]; then
 			DAEMONARGS="$DAEMON $DAEMONARGS"
 			XFLAGS="$XFLAGS NAMEINARGS "
 		fi
-	echo "	server		= $SERVER"
-
-	[ "${DAEMONARGS:-n}" = "n" ] || echo "	server_args	= $DAEMONARGS"
+	if [ "${SERVER:-not}" != "not" ]; then
+		echo "	server		= $SERVER"
+		[ "${DAEMONARGS:-n}" = "n" ] || echo "	server_args	= $DAEMONARGS"
+	fi
 
 	for i in $FLAGS; do
 		case "$i" in
@@ -109,7 +112,7 @@
 	if [ "${FAMILY:-not}" != "not" ]; then
 		XFLAGS="$XFLAGS $FAMILY"
 	fi
-	[ "${XFLAGS:-n}" = "n" ]	|| echo "	flags		=$XFLAGS"
+	[ "${XFLAGS:-n}" = "n" ]	|| echo "	flags		= $XFLAGS"
 
 	[ "${INTERFACE:-n}" = "n" ]	|| echo "	bind		= $INTERFACE"
 	[ "${NICE:-n}" = "n" ]		|| echo "	nice		= $NICE"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xinetd/xinetd.inet.sh?r1=1.17&r2=1.18&f=u