rpms/rwho/devel netkit-rwho-0.17-waitchild.patch, NONE, 1.1 rwho.spec, 1.17, 1.18

[fedora-cvs-commits at redhat.com]

Author: harald

Update of /cvs/dist/rpms/rwho/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3418

Modified Files:
	rwho.spec 
Added Files:
	netkit-rwho-0.17-waitchild.patch 
Log Message:
- exit daemon, if child process dies (bug #202493)


netkit-rwho-0.17-waitchild.patch:
 rwhod.c |   10 ++++++++++
 1 files changed, 10 insertions(+)

--- NEW FILE netkit-rwho-0.17-waitchild.patch ---
--- netkit-rwho-0.17/rwhod/rwhod.c.waitchild	2006-08-15 14:20:01.000000000 +0200
+++ netkit-rwho-0.17/rwhod/rwhod.c	2006-08-15 14:20:28.000000000 +0200
@@ -125,6 +125,7 @@
 
 static void huphandler(int);
 static void termhandler(int);
+static void childhandler(int);
 static void sendpacket(struct whod *);
 static void getboottime(struct whod *);
 
@@ -213,6 +214,7 @@
 	(void) umask(022);
 
 	signal(SIGTERM, termhandler);
+	signal(SIGCHLD, childhandler);
 	child_pid = fork();
 	if (child_pid < 0) {
 		syslog(LOG_ERR, "fork: %m");
@@ -332,6 +334,14 @@
 	exit(0);
 }
 
+static void
+childhandler(int dummy)
+{
+        (void) dummy;
+        exit(0);
+}
+
+
 /*
  * Obtain boot time again
  */


Index: rwho.spec
===================================================================
RCS file: /cvs/dist/rpms/rwho/devel/rwho.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rwho.spec	12 Jul 2006 08:05:15 -0000	1.17
+++ rwho.spec	15 Aug 2006 12:23:38 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Displays who is logged in to local network machines.
 Name: rwho
 Version: 0.17
-Release: 25.2.2
+Release: 26
 License: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rwho-%{version}.tar.gz
@@ -15,6 +15,7 @@
 Patch6: netkit-rwho-0.17-wd_we.patch
 Patch7: netkit-rwho-0.17-time.patch
 Patch8: netkit-rwho-0.17-gcc4.patch
+Patch9: netkit-rwho-0.17-waitchild.patch
 Requires: /sbin/chkconfig /etc/init.d
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -37,6 +38,7 @@
 %patch6 -p1 -b .wd_we
 %patch7 -p1 -b .time
 %patch8 -p1 -b .gcc4
+%patch9 -p1 -b .waitchild
 
 %build
 sh configure --with-c-compiler=gcc
@@ -98,6 +100,9 @@
 %config /etc/rc.d/init.d/rwhod
 
 %changelog
+* Tue Aug 15 2006 Harald Hoyer <harald at redhat.com> - 0.17-26
+- exit daemon, if child process dies (bug #202493)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.17-25.2.2
 - rebuild