rpms/SysVinit/devel SysVinit.spec, 1.58, 1.59 sysvinit-2.86-chroot.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: notting

Update of /cvs/dist/rpms/SysVinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31446

Modified Files:
	SysVinit.spec sysvinit-2.86-chroot.patch 
Log Message:
pidof: ignore -c when called as non-root (#230829)



Index: SysVinit.spec
===================================================================
RCS file: /cvs/dist/rpms/SysVinit/devel/SysVinit.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- SysVinit.spec	13 Feb 2007 21:08:56 -0000	1.58
+++ SysVinit.spec	16 Apr 2007 22:23:48 -0000	1.59
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes
 Name: SysVinit
 Version: 2.86
-Release: 15
+Release: 16
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz
@@ -139,6 +139,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Apr 16 2007 Bill Nottingham <notting at redhat.com> - 2.86-16
+- pidof: ignore '-c' when called as non-root (#230829)
+
 * Tue Feb 13 2007 Bill Nottingham <notting at redhat.com> - 2.86-15
 - spec cleanups; remove initunlvl part of %%post, as that hasn't
   been supported for nearly 4 years

sysvinit-2.86-chroot.patch:
 man/pidof.8    |    5 +++++
 src/killall5.c |   28 +++++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

Index: sysvinit-2.86-chroot.patch
===================================================================
RCS file: /cvs/dist/rpms/SysVinit/devel/sysvinit-2.86-chroot.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sysvinit-2.86-chroot.patch	19 Dec 2005 21:12:52 -0000	1.1
+++ sysvinit-2.86-chroot.patch	16 Apr 2007 22:23:48 -0000	1.2
@@ -14,8 +14,8 @@
  Single shot - this instructs the program to only return one \fIpid\fP.
 +.IP -c
 +Only return process ids that are running with the same root directory.
-+This option does not make sense for non-root users, as they will be
-+unable to check the current root directory of processes they do not own.
++This option is ignored for non-root users, as they will be unable to check
++the current root directory of processes they do not own.
  .IP -x
  Scripts too - this causes the program to also return process id's of
  shells running the named scripts.
@@ -40,7 +40,7 @@
  			closelog();
  			exit(1);
 +		case 'c':
-+			chroot_check = 1;
++			if (geteuid() == 0) chroot_check = 1;
 +			break;
  		case 'o':
  			if (oind >= PIDOF_OMITSZ -1) {