From 9eb3f819a0e9586502ff614a785a783fed55cd0e Mon Sep 17 00:00:00 2001
From: saikiranakula-amzn <saakla@amazon.com>
Date: Thu, 28 Dec 2023 18:22:58 +0000
Subject: [PATCH 1/2] change exit codes

---
 api/src/gmsa_service.cpp |  4 ++--
 config/src/config.cpp    | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/api/src/gmsa_service.cpp b/api/src/gmsa_service.cpp
index 1e57bdf7..665eccd8 100644
--- a/api/src/gmsa_service.cpp
+++ b/api/src/gmsa_service.cpp
@@ -1939,12 +1939,12 @@ int HealthCheck(std::string serviceName)
         }
         else
         {
-            return -1;
+            return 1;
         }
     }
     catch ( ... )
     {
-        return -1;
+        return 1;
     }
 
     return 0;
diff --git a/config/src/config.cpp b/config/src/config.cpp
index bade21e6..c858e59f 100644
--- a/config/src/config.cpp
+++ b/config/src/config.cpp
@@ -106,7 +106,15 @@ int parse_options( int argc, const char* argv[], creds_fetcher::Daemon& cf_daemo
             case 'c':
                 healthCheckResponse = HealthCheck("test");
                 std::cout << healthCheckResponse << std::endl;
-                return EXIT_FAILURE;
+                if(healthCheckResponse != 0)
+                {
+                    exit(EXIT_FAILURE);
+                }
+                else
+                {
+                    exit(EXIT_SUCCESS);
+                }
+
             default:
                 std::cout << "Run with --help to see options" << std::endl;
                 return EXIT_FAILURE;

From b164b9352add2a12ff971a9b6acc14d87b4feead Mon Sep 17 00:00:00 2001
From: saikiranakula-amzn <saakla@amazon.com>
Date: Thu, 28 Dec 2023 18:26:44 +0000
Subject: [PATCH 2/2] change exit code

---
 api/src/gmsa_service.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/api/src/gmsa_service.cpp b/api/src/gmsa_service.cpp
index 665eccd8..b53caa16 100644
--- a/api/src/gmsa_service.cpp
+++ b/api/src/gmsa_service.cpp
@@ -1914,7 +1914,9 @@ int RunGrpcServer( std::string unix_socket_dir, std::string krb_files_dir,
  */
 int HealthCheck(std::string serviceName)
 {
-    std::string server_address{ "unix:/var/credentials-fetcher/socket/credentials_fetcher.sock" };
+    try
+    {
+     std::string server_address{ "unix:/var/credentials-fetcher/socket/credentials_fetcher.sock" };
     std::shared_ptr<grpc::Channel> channel = grpc::CreateChannel( server_address,
                                                                 grpc::InsecureChannelCredentials());
     std::unique_ptr<credentialsfetcher::CredentialsFetcherService::Stub> stub =  credentialsfetcher::CredentialsFetcherService::NewStub( channel );
@@ -1926,9 +1928,6 @@ int HealthCheck(std::string serviceName)
     credentialsfetcher::HealthCheckResponse response;
     grpc::ClientContext context;
     grpc::Status status;
-
-    try
-    {
         // Send request
         status = stub->HealthCheck( &context, request, &response );