Attachment 1450642 Details for Bug 1590541 – Patch redefines __pids_pidsof() to catch chroot'd processes

[patch] Patch redefines __pids_pidsof() to catch chroot'd processes

vsftpd-3.0.2-22_bugs.centos.org_12747.patch (text/plain), 2.09 KB, created by Richard D Alloway on 2018-06-12 19:59:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Richard D Alloway

Created: 2018-06-12 19:59:42 UTC

Size: 2.09 KB

patch

obsolete

>From b6c9e985be0a89c6e65d54667c33e2169d5452b1 Mon Sep 17 00:00:00 2001
>From: Rich Alloway <richard.alloway@roguewave.com>
>Date: Mon, 11 Jun 2018 17:03:13 -0400
>Subject: [PATCH] Check in vsftpd.init which resolves issue reported in
> https://bugs.centos.org/view.php?id=12747 as well as wrapping the NETWORKING
> variable in quotes so as to not throw an error if it not initialized
>
>---
> src/rpmbuild/SOURCES/vsftpd.init | 9 ++++++++-
> src/rpmbuild/SPECS/vsftpd.spec   | 5 ++++-
> 2 files changed, 12 insertions(+), 2 deletions(-)
>
>diff --git a/src/rpmbuild/SOURCES/vsftpd.init b/src/rpmbuild/SOURCES/vsftpd.init
>index 91c23e9..998ca9a 100755
>--- a/src/rpmbuild/SOURCES/vsftpd.init
>+++ b/src/rpmbuild/SOURCES/vsftpd.init
>@@ -24,6 +24,13 @@
> # Source networking configuration.
> . /etc/sysconfig/network
> 
>+# Redefine __pids_pidof() from /etc/rc.d/init.d/functions to catch chroot'd procs (no -c param)
>+# Output PIDs of matching processes, found using pidof
>+__pids_pidof() {
>+	pidof -m -o $$ -o $PPID -o %PPID -x "$1" || \
>+		pidof -m -o $$ -o $PPID -o %PPID -x "${1##*/}"
>+}
>+
> RETVAL=0
> prog="vsftpd"
> 
>@@ -31,7 +38,7 @@ start() {
>         # Start daemons.
> 
> 	# Check that networking is up.
>-	[ ${NETWORKING} = "no" ] && exit 1
>+	[ "${NETWORKING}" = "no" ] && exit 1
> 
> 	[ -x /usr/sbin/vsftpd ] || exit 1
> 
>diff --git a/src/rpmbuild/SPECS/vsftpd.spec b/src/rpmbuild/SPECS/vsftpd.spec
>index 5b0bdfe..63a33b6 100644
>--- a/src/rpmbuild/SPECS/vsftpd.spec
>+++ b/src/rpmbuild/SPECS/vsftpd.spec
>@@ -3,7 +3,7 @@
> 
> Name: vsftpd
> Version: 3.0.2
>-Release: 22%{?dist}
>+Release: 22_rw001%{?dist}
> Summary: Very Secure Ftp Daemon
> 
> Group: System Environment/Daemons
>@@ -202,6 +202,9 @@ rm -rf $RPM_BUILD_ROOT
> %{_sysconfdir}/rc.d/init.d/vsftpd
> 
> %changelog
>+* Wed Jun  6 2018 Rich Alloway <richard.alloway@roguewave.com> - 3.0.2-22_rw001
>+- Resolves: https://bugs.centos.org/view.php?id=12747 - chrooted vsftpd child processes are not killed by "service vsftpd stop"
>+
> * Thu Mar 23 2017 Zdenek Dohnal <zdohnal@redhat.com> - 3.0.2-22
> - Resolves: #1432054 - secure ftp stopped working with default TLS settings in the new vsftpd package
> 
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1590541: 1450642