Updated for UseAgentCert == false to prevent segfaults

Author: rlillback

agent.h

@@ -47,7 +47,7 @@ extern ScheduledJob_t* currentJob; /* Defined in schedule.c */
 #define AGENT_MAJOR 3ULL
 #define AGENT_MINOR 0ULL
 #define AGENT_MICRO 0ULL
-#define AGENT_BUILD 1ULL
+#define AGENT_BUILD 2ULL
 
 #define AGENT_VERSION \
 ((AGENT_MAJOR << 48) | \

enrollment.c

@@ -280,13 +280,10 @@ int cms_job_enroll(SessionJob_t * jobInfo, char *sessionToken,
 
         if (ConfigData->UseAgentCert) {
             /* Verify the target store isn't the Agent store */
-            if (enrConf->StorePath) {
+            if (enrConf->StorePath && ConfigData->UseAgentCert && ConfigData->AgentCert) {
                 if (0 == strcasecmp(ConfigData->AgentCert, enrConf->StorePath)) {
-
-                    log_warn("%s::%s(%d) : Attempting to re-enroll the agent "
-                             "cert is not allowed.", LOG_INF);
-                    append_linef(&statusMessage, "Attempting to re-enroll the "
-                                 "agent cert is not allowed.");
+                    log_warn("%s::%s(%d) : Attempting to re-enroll the agent cert is not allowed.", LOG_INF);
+                    append_linef(&statusMessage, "Attempting to re-enroll the agent cert is not allowed.");
                     failed = true;
                 }
             }

inventory.c

@@ -414,7 +414,7 @@ int cms_job_inventory(SessionJob_t * jobInfo, char *sessionToken)
                 failed = true;
             }
 
-            if (ConfigData->UseAgentCert) {
+            if (ConfigData->UseAgentCert && ConfigData->AgentCert) {
                 /* Verify the target store isn't the Agent store */
                 if (0 == strcasecmp(ConfigData->AgentCert, invConf->Job.StorePath)) {
 

management.c

@@ -335,12 +335,14 @@ static bool validate_management_store_configuration(ManagementConfigResp_t* manC
             append_linef(statusMessage, "The store path must be a file and not a directory.");
             failed = true;
         }
-        /* Is the target store the Agent store? */
-        if (0 == strcasecmp(ConfigData->AgentCert, manConf->Job.StorePath)) {
-            log_warn("%s::%s(%d) : Attempting a Management job on the agent cert store is not allowed.", LOG_INF);
-            append_linef(statusMessage, "Attempting a Management job the agent cert store is not allowed.");
-            failed = true;
-        }
+		if (ConfigData->UseAgentCert && ConfigData->AgentCert) { /* If we have an agent cert, we can't manage it through this job */
+            /* Is the target store the Agent store? */
+            if (0 == strcasecmp(ConfigData->AgentCert, manConf->Job.StorePath)) {
+                log_warn("%s::%s(%d) : Attempting a Management job on the agent cert store is not allowed.", LOG_INF);
+                append_linef(statusMessage, "Attempting a Management job the agent cert store is not allowed.");
+                failed = true;
+            }
+		}
         /* Verify the target store exists */
         if (!file_exists(manConf->Job.StorePath)) {
             log_warn("%s::%s(%d) : Attempting to manage a certificate store that does not exist yet.", LOG_INF);