From 2cd56438859c74e9892ceaae67eed9a87ea4e5fd Mon Sep 17 00:00:00 2001
From: Jiri Skala <jskala@fedoraproject.org>
Date: Apr 07 2010 08:47:30 +0000
Subject: - corrected daemonize_plus patch - don't try kill parent when vsftpd isn't

    daemonized

---

diff --git a/vsftpd-2.1.1-daemonize_plus.patch b/vsftpd-2.1.1-daemonize_plus.patch
index f06cb74..5f89068 100644
--- a/vsftpd-2.1.1-daemonize_plus.patch
+++ b/vsftpd-2.1.1-daemonize_plus.patch
@@ -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");
      }
-+    if (tunable_background) {
++    if (tunable_background)
 +    {
 +      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");
      }
-+    if (tunable_background) {
++    if (tunable_background)
 +    {
 +      vsf_sysutil_kill(vsf_sysutil_getppid(), kVSFSysUtilSigUSR1);
 +    }
diff --git a/vsftpd.spec b/vsftpd.spec
index 489f9c7..f22b860 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -2,7 +2,7 @@
 
 Name: vsftpd
 Version: 2.2.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -142,6 +142,9 @@ fi
 
 
 %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
 - fixes #544251 - /etc/rc.d/init.d/vsftpd does not start more than one daemon