- corrected daemonize_plus patch - don't try kill parent when vsftpd isn't

daemonized
This commit is contained in:
Jiri Skala 2010-04-07 08:47:30 +00:00
parent e8950c5116
commit 2cd5643885
2 changed files with 6 additions and 3 deletions

View File

@ -39,7 +39,7 @@ diff -up vsftpd-2.1.1/standalone.c.daemonize_plus vsftpd-2.1.1/standalone.c
{ {
die("could not bind listening IPv4 socket"); die("could not bind listening IPv4 socket");
} }
+ if (tunable_background) { + if (tunable_background)
+ { + {
+ vsf_sysutil_kill(vsf_sysutil_getppid(), kVSFSysUtilSigUSR1); + vsf_sysutil_kill(vsf_sysutil_getppid(), kVSFSysUtilSigUSR1);
+ } + }
@ -50,7 +50,7 @@ diff -up vsftpd-2.1.1/standalone.c.daemonize_plus vsftpd-2.1.1/standalone.c
{ {
die("could not bind listening IPv6 socket"); die("could not bind listening IPv6 socket");
} }
+ if (tunable_background) { + if (tunable_background)
+ { + {
+ vsf_sysutil_kill(vsf_sysutil_getppid(), kVSFSysUtilSigUSR1); + vsf_sysutil_kill(vsf_sysutil_getppid(), kVSFSysUtilSigUSR1);
+ } + }

View File

@ -2,7 +2,7 @@
Name: vsftpd Name: vsftpd
Version: 2.2.2 Version: 2.2.2
Release: 4%{?dist} Release: 5%{?dist}
Summary: Very Secure Ftp Daemon Summary: Very Secure Ftp Daemon
Group: System Environment/Daemons Group: System Environment/Daemons
@ -142,6 +142,9 @@ fi
%changelog %changelog
* Wed Apr 07 2010 Jiri Skala <jskala@redhat.com> - 2.2.2-5
- corrected daemonize_plus patch - don't try kill parent when vsftpd isn't daemonized
* Tue Mar 16 2010 Jiri Skala <jskala@redhat.com> - 2.2.2-4 * Tue Mar 16 2010 Jiri Skala <jskala@redhat.com> - 2.2.2-4
- fixes #544251 - /etc/rc.d/init.d/vsftpd does not start more than one daemon - fixes #544251 - /etc/rc.d/init.d/vsftpd does not start more than one daemon