Removed references to fetchlogs

Author: rlillback

agent.c

@@ -46,7 +46,6 @@
 #include "config.h"
 #include "session.h"
 #include "global.h"
-#include "fetchlogs.h"
 #include "utils.h"
 
 /******************************************************************************/
@@ -64,7 +63,6 @@ ScheduledJob_t *JobList;
 const char     *cap_pem_inventory = "CertStores.PEM.Inventory";
 const char     *cap_pem_management = "CertStores.PEM.Management";
 const char     *cap_pem_reenrollment = "CertStores.PEM.Reenrollment";
-const char     *cap_fetch_logs = "Custom.FetchLogs";
 
 #if defined(__OPEN_SSL__)
 char            engine_id[21];  /* 20 Characters should be enough */
@@ -337,8 +335,6 @@ int run_job(SessionJob_t * job)
         status = cms_job_manage(job, SessionData.Token, &chainJobId);
     } else if (0 == strcasecmp(job->JobTypeId, CAP_PEM_REENROLLMENT)) {
         status = cms_job_enroll(job, SessionData.Token, &chainJobId);
-    } else if (0 == strcasecmp(job->JobTypeId, CAP_FETCH_LOGS)) {
-        status = cms_job_fetchLogs(job, SessionData.Token);
     } else {
         log_error("%s::%s(%d) : Unimplemented support for job type %s. Ignoring job request", LOG_INF, job->JobTypeId);
     }

constants.h

@@ -17,13 +17,11 @@
 #define CAP_PEM_INVENTORY "a809ce1f-1eea-4738-a38e-15708c89c981"
 #define CAP_PEM_MANAGEMENT "1d411b36-ae72-433f-9f3f-8593e836a1af"
 #define CAP_PEM_REENROLLMENT "aa015d10-cffc-41f7-a9a4-c9615f6f3bdf"
-#define CAP_FETCH_LOGS "0D8CF0C8-56CA-4B8A-B16A-C062018E170D"
 
 /* KF v9 adds in text Capabilities - they are defined in agent.c */
 extern const char* cap_pem_inventory;
 extern const char* cap_pem_management;
 extern const char* cap_pem_reenrollment;
-extern const char* cap_fetch_logs;
 
 /* The following capabilities are not implemented in the C-Agent */
 #define CAP_AWS_INVENTORY "afb8c78d-1436-4c93-a8e7-0218c2cb6955"

fetchlogs.c

@@ -283,18 +283,6 @@ static void prioritize_jobs(ScheduledJob_t * *pJobList,
             schedule_job(pJobList, job_to_schedule, time(NULL));
         }
     }
-    /* Log file retrieval jobs */
-    for (i = 0; response->Session.Jobs_count > i; i++) {
-        job_to_schedule = response->Session.Jobs[i];
-        if (!job_to_schedule || !job_to_schedule->JobTypeId) {
-            log_warn("%s::%s(%d) : Null job or JobTypeId at index %d", LOG_INF, i);
-            continue;
-        }
-        if (0 == strcasecmp(CAP_FETCH_LOGS, job_to_schedule->JobTypeId)) {
-            log_trace("%s::%s(%d) : Adding log retrieval job %s", LOG_INF, job_to_schedule->JobId);
-            schedule_job(pJobList, job_to_schedule, time(NULL));
-        }
-    }
     return;
 } /* prioritize_jobs */
 
@@ -314,15 +302,14 @@ static bool register_add_capabilities(SessionRegisterReq_t * sessionReq) {
         return false;
     }
 
-    sessionReq->Capabilities_count = 4;
+    sessionReq->Capabilities_count = 3;
     sessionReq->Capabilities = calloc(sessionReq->Capabilities_count, sizeof(char *));
     if (sessionReq->Capabilities) {
         sessionReq->Capabilities[0] = strdup(cap_pem_inventory);
         sessionReq->Capabilities[1] = strdup(cap_pem_management);
         sessionReq->Capabilities[2] = strdup(cap_pem_reenrollment);
-        sessionReq->Capabilities[3] = strdup(cap_fetch_logs);
         if (!sessionReq->Capabilities[0] || !sessionReq->Capabilities[1] ||
-            !sessionReq->Capabilities[2] || !sessionReq->Capabilities[3]) {
+            !sessionReq->Capabilities[2]) {
             log_error("%s::%s(%d) : Null pointer dereference - failed to allocate capabilities", LOG_INF);
             return false;
         }