From 398907290e9a98711206dafb456d45f534ac4668 Mon Sep 17 00:00:00 2001
From: fengweihao <fengweihao@iie.ac.cn>
Date: Thu, 9 Apr 2020 14:29:13 +0800
Subject: 增加CI构建，关闭YUM仓库上传
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 program/include/cert_session.h |  3 ++-
 program/src/cert_conf.cpp      |  2 +-
 program/src/cert_session.cpp   | 13 ++++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'program')

diff --git a/program/include/cert_session.h b/program/include/cert_session.h
index f858fc3..c73a03f 100644
--- a/program/include/cert_session.h
+++ b/program/include/cert_session.h
@@ -9,7 +9,8 @@
 #define _CERT_SESSION_H
 
 #include <event2/event_compat.h>
-#include "MESA_list_queue.h"
+#include <MESA/MESA_list_queue.h>
+
 #include "rt_sync.h"
 
 
diff --git a/program/src/cert_conf.cpp b/program/src/cert_conf.cpp
index a235ec2..326e503 100644
--- a/program/src/cert_conf.cpp
+++ b/program/src/cert_conf.cpp
@@ -16,7 +16,7 @@
 #include "cert_conf.h"
 #include "logging.h"
 
-#include "MESA_prof_load.h"
+#include <MESA/MESA_prof_load.h>
 
 struct config_bucket_t certConfig;
 
diff --git a/program/src/cert_session.cpp b/program/src/cert_session.cpp
index 6c54347..1262cf2 100644
--- a/program/src/cert_session.cpp
+++ b/program/src/cert_session.cpp
@@ -39,7 +39,7 @@
 
 #include <async.h>
 #include <MESA/Maat_rule.h>
-#include <field_stat2.h>
+#include <MESA/field_stat2.h>
 #include <MESA/MESA_prof_load.h>
 #include <MESA/MESA_htable.h>
 
@@ -1126,8 +1126,15 @@ static int x509_online_append(struct x509_object_ctx *def, struct tfe_http_reque
         {
             if (1==is_valid)  pxy_obj = get_obj_for_id(1);
             if (0==is_valid)  pxy_obj = get_obj_for_id(0);
-            assert(pxy_obj!=NULL);
-            mesa_runtime_log(RLOG_LV_DEBUG, MODULE_NAME, "Certificate issued by table id %d", keyring_id);
+			if (pxy_obj == NULL)
+			{
+				mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "Get the default keypair failed, EXIT!!!");
+				exit(0);
+			}
+			else
+			{
+				mesa_runtime_log(RLOG_LV_DEBUG, MODULE_NAME, "Certificate issued by table id %d", keyring_id);
+			}
         }
         else
         {
-- 
cgit v1.2.3