rpms/xinetd/devel xinetd.init,1.14,1.15 xinetd.spec,1.65,1.66

[Jan Zeleny]

Author: jzeleny

Update of /cvs/extras/rpms/xinetd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18944

Modified Files:
	xinetd.init xinetd.spec 
Log Message:
new config option - file limit, fixed init script issues with SELinux


Index: xinetd.init
===================================================================
RCS file: /cvs/extras/rpms/xinetd/devel/xinetd.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xinetd.init	12 Oct 2009 08:56:17 -0000	1.14
+++ xinetd.init	20 Oct 2009 11:51:46 -0000	1.15
@@ -52,10 +52,9 @@ prog="xinetd"
 start(){
     [ -f /usr/sbin/xinetd ] || exit 5
     [ -f /etc/xinetd.conf ] || exit 6
-	touch /var/run/xinetd.pid > /dev/null 2>&1
-	[ $? -eq 0 ] || exit 4
-	touch /var/lock/subsys/xinetd > /dev/null 2>&1
-	[ $? -eq 0 ] || exit 4
+    # this is suitable way considering SELinux is guarding write 
+    # access to PID file
+	[ $EUID -eq 0 ] || exit 4
 
     echo -n $"Starting $prog: "
 
@@ -83,16 +82,9 @@ start(){
 stop(){
     [ -f /usr/sbin/xinetd ] || exit 5
     [ -f /etc/xinetd.conf ] || exit 6
-    if [ -f /var/lock/subsys/xinetd ]; then
-		if [ ! -w /var/lock/subsys/xinetd ]; then
-			exit 4
-		fi
-	fi
-    if [ -f /var/run/xinetd.pid ]; then
-		if [ ! -w /var/run/xinetd.pid ]; then
-			exit 4
-		fi
-	fi
+    # this is suitable way considering SELinux is guarding write 
+    # access to PID file
+	[ $EUID -eq 0 ] || exit 4
 
     echo -n $"Stopping $prog: "
     killproc -p /var/run/xinetd.pid $prog


Index: xinetd.spec
===================================================================
RCS file: /cvs/extras/rpms/xinetd/devel/xinetd.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- xinetd.spec	12 Oct 2009 08:56:17 -0000	1.65
+++ xinetd.spec	20 Oct 2009 11:51:46 -0000	1.66
@@ -1,7 +1,7 @@
 Summary: A secure replacement for inetd
 Name: xinetd
 Version: 2.3.14
-Release: 26%{?dist}
+Release: 27%{?dist}
 License: xinetd 
 Group: System Environment/Daemons
 Epoch: 2
@@ -21,6 +21,7 @@ Patch8: xinetd-2.3.14-ident-bind.patch
 Patch9: xinetd-2.3.14-readable-debuginfo.patch
 Patch10: xinetd-2.3.14-autoconf.patch
 Patch11: xinetd-2.3.14-poll.patch
+Patch12: xinetd-2.3.14-file-limit.patch
 
 BuildRequires: autoconf, automake
 BuildRequires: libselinux-devel >= 1.30
@@ -60,6 +61,7 @@ located in the /etc/xinetd.d directory.
 %patch9 -p1 -b .readable-debuginfo
 %patch10 -p1 -b .autoconf
 %patch11 -p1 -b .poll
+%patch12 -p1 -b .file-limit
 
 aclocal
 autoconf
@@ -119,6 +121,10 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Tue Oct 20 2009 Jan Zeleny <jzeleny at redhat.com> - 2:2.3.14-27
+- last update of init script modified to work with SELinux correctly
+- added support for new configuration option - file limit for service
+
 * Mon Oct 12 2009 Jan Zeleny <jzeleny at redhat.com> - 2:2.3.14-26
 - updated init script (LSB compliance - #528154)