From e3f9f2783f95a4c5505455d9022d994efd18a97a Mon Sep 17 00:00:00 2001
From: Ferenc Wagner <wferi@niif.hu>
Date: Wed, 9 Dec 2009 12:36:45 +0100
Subject: [PATCH] Fix pidfile removal

The http://svn.middleware.georgetown.edu/view/cpp-sp?view=rev&revision=3209
upstream fix for https://bugs.internet2.edu/jira/browse/SSPCPP-272.
---
 shibd/shibd.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shibd/shibd.cpp b/shibd/shibd.cpp
index 2ac256d..eee5c8b 100644
--- a/shibd/shibd.cpp
+++ b/shibd/shibd.cpp
@@ -387,7 +387,7 @@ int main(int argc, char *argv[])
             fprintf(stderr, "listener failure during service\n");
             listener->term();
             conf.term();
-            if (pidfile)
+            if (daemonize && pidfile)
                 unlink(pidfile);
             return -3;
         }
@@ -395,7 +395,7 @@ int main(int argc, char *argv[])
     }
 
     conf.term();
-    if (pidfile)
+    if (daemonize && pidfile)
         unlink(pidfile);
     return 0;
 }
-- 
2.1.4