[cpp-sp] 01/13: Fix pidfile removal

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to annotated tag debian/2.3.1+dfsg-1
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=e3f9f2783f95a4c5505455d9022d994efd18a97a

commit e3f9f2783f95a4c5505455d9022d994efd18a97a
Author: Ferenc Wagner <wferi at niif.hu>
AuthorDate: Wed Dec 9 12:36:45 2009 +0100

    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;
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.