From: Adrian-Ken Rueegsegger <ken@codelabs.ch>
Date: Wed, 23 Jan 2013 14:38:28 +0000 (+0100)
Subject: Return SS_RC_INITIALIZATION_FAILED if pid file exists
X-Git-Tag: 5.0.2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a25047e412ab89904477cd2f223f921f413e3732;p=thirdparty%2Fstrongswan.git

Return SS_RC_INITIALIZATION_FAILED if pid file exists

Let charon return SS_RC_INITIALIZATION_FAILED if an existing pid file is found.
Starter only terminates itself if the result code of the daemon is a valid
SS_RC_* value.
---

diff --git a/src/charon/charon.c b/src/charon/charon.c
index c301874c8d..f4bd27d342 100644
--- a/src/charon/charon.c
+++ b/src/charon/charon.c
@@ -401,7 +401,6 @@ int main(int argc, char *argv[])
 	if (check_pidfile())
 	{
 		DBG1(DBG_DMN, "charon already running (\""PID_FILE"\" exists)");
-		status = -1;
 		goto deinit;
 	}