TSG-9703 certstore适配Rocky Linux8.5

.gitlab-ci.yml

@@ -1,86 +1,72 @@
-image: "git.mesalab.cn:7443/mesa_platform/build-env:master"
-
 variables:
   GIT_STRATEGY: "clone"
   BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/
   INSTALL_PREFIX: "/opt/tsg/certstore"
   TESTING_VERSION_BUILD: 0
+  BUILD_IMAGE_CENTOS7: "git.mesalab.cn:7443/mesa_platform/build-env:master"
+  BUILD_IMAGE_CENTOS8: "git.mesalab.cn:7443/mesa_platform/build-env:rockylinux"
 
 stages:
 - build
 
-.build_by_travis:
+###############################################################################
+# The script is set to el7 or el8
+###############################################################################
+.build_before_script:
   before_script:
-  - mkdir -p $BUILD_PADDING_PREFIX/$CI_PROJECT_NAMESPACE/
+    - mkdir -p $BUILD_PADDING_PREFIX/$CI_PROJECT_NAMESPACE/
-  - ln -s $CI_PROJECT_DIR $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
+    - ln -s $CI_PROJECT_DIR $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
-  - cd $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
+    - cd $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
-  - chmod +x ./ci/travis.sh
+    - chmod +x ./ci/travis.sh
+    - yum makecache
+
+.build_by_travis_for_centos7:
+  stage: build
+  image: $BUILD_IMAGE_CENTOS7
+  extends: .build_before_script
   script:
-  - yum makecache
+    - ./ci/travis.sh
-  - ./ci/travis.sh
-  - cd build
   tags:
-  - share
+    - share
 
-branch_build_debug:
+.build_by_travis_for_centos8:
   stage: build
-  extends: .build_by_travis
+  image: $BUILD_IMAGE_CENTOS8
+  extends: .build_before_script
+  script:
+    - ./ci/travis.sh
+  tags:
+    - share
+
+###############################################################################
+# compile use image: centos7
+###############################################################################
+branch_build_debug_for_centos7:
+  extends: .build_by_travis_for_centos7
   variables:
     BUILD_TYPE: Debug
   except:
-    - /^develop.*$/i
+    - /^develop-.*$/i
-    - /^master.*$/i
+    - /^release-.*$/i
     - tags
 
-branch_build_release:
+branch_build_release_for_centos7:
-  stage: build
   variables:
     BUILD_TYPE: RelWithDebInfo
-  extends: .build_by_travis
+  extends: .build_by_travis_for_centos7
   except:
-    - /^develop.*$/i
+    - /^develop-.*$/i
-    - /^master.*$/i
+    - /^release-.*$/i
     - tags
 
-develop_build_debug:
+release_build_debug_for_centos7:
-  stage: build
-  extends: .build_by_travis
   variables:
+    UPLOAD_SYMBOL_FILES: 1
     BUILD_TYPE: Debug
     PACKAGE: 1
-  artifacts:
-    name: "certstore-develop-$CI_COMMIT_REF_NAME-debug"
-    paths:
-      - build/*.rpm
-  only:
-    - /^develop.*$/i
-    - /^master.*$/i
-
-develop_build_release:
-  stage: build
-  extends: .build_by_travis
-  variables:
-    BUILD_TYPE: RelWithDebInfo
-    PACKAGE: 1
-  artifacts:
-    name: "certstore-develop-$CI_COMMIT_REF_NAME-release"
-    paths:
-      - build/*.rpm
-  only:
-    - /^develop.*$/i
-    - /^master.*$/i
-
-
-release_build_release:
-  stage: build
-  variables:
-    BUILD_TYPE: RelWithDebInfo
-    PACKAGE: 1
-    UPLOAD: 1
-    SYMBOL_TARGET: certstore
     PULP3_REPO_NAME: tsg-stable-x86_64.el7
     PULP3_DIST_NAME: tsg-stable-x86_64.el7
-  extends: .build_by_travis
+  extends: .build_by_travis_for_centos7
   artifacts:
     name: "certstore-$CI_COMMIT_REF_NAME-debug"
     paths:
@@ -88,20 +74,69 @@ release_build_release:
   only:
     - tags
 
-release_build_release_devel:
+release_build_release_for_centos7:
-  stage: build
   variables:
     BUILD_TYPE: RelWithDebInfo
-    ENABLE_DEVEL_SWITCH: "ON"
+    UPLOAD_SYMBOL_FILES: 1
     PACKAGE: 1
-    UPLOAD: 1
-    SYMBOL_TARGET: certstore
     PULP3_REPO_NAME: tsg-stable-x86_64.el7
     PULP3_DIST_NAME: tsg-stable-x86_64.el7
-  extends: .build_by_travis
+  extends: .build_by_travis_for_centos7
   artifacts:
     name: "certstore-$CI_COMMIT_REF_NAME-release"
     paths:
       - build/*.rpm
   only:
     - tags
+
+###############################################################################
+# compile use image: centos8
+###############################################################################
+branch_build_debug_for_centos8:
+  extends: .build_by_travis_for_centos8
+  variables:
+    BUILD_TYPE: Debug
+  except:
+    - /^develop-.*$/i
+    - /^release-.*$/i
+    - tags
+
+branch_build_release_for_centos8:
+  variables:
+    BUILD_TYPE: RelWithDebInfo
+  extends: .build_by_travis_for_centos8
+  except:
+    - /^develop-.*$/i
+    - /^release-.*$/i
+    - tags
+
+release_build_debug_for_centos8:
+  variables:
+    UPLOAD_SYMBOL_FILES: 1
+    BUILD_TYPE: Debug
+    PACKAGE: 1
+    PULP3_REPO_NAME: tsg-stable-x86_64.el8
+    PULP3_DIST_NAME: tsg-stable-x86_64.el8
+  extends: .build_by_travis_for_centos8
+  artifacts:
+    name: "certstore-$CI_COMMIT_REF_NAME-debug"
+    paths:
+      - build/*.rpm
+  only:
+    - tags
+
+release_build_release_for_centos8:
+  variables:
+    BUILD_TYPE: RelWithDebInfo
+    UPLOAD_SYMBOL_FILES: 1
+    PACKAGE: 1
+    PULP3_REPO_NAME: tsg-stable-x86_64.el8
+    PULP3_DIST_NAME: tsg-stable-x86_64.el8
+  extends: .build_by_travis_for_centos8
+  artifacts:
+    name: "certstore-$CI_COMMIT_REF_NAME-release"
+    paths:
+      - build/*.rpm
+  only:
+    - tags
+    

program/src/cert_session.cpp

@@ -1032,7 +1032,9 @@ void keyring_table_free_cb(int __attribute__((__unused__))table_id, MAAT_PLUGIN_
 long __attribute__((__unused__))argl, void __attribute__((__unused__))*argp)
 {
     if (*ad == NULL)
-        return;
+    {
+		return;
+	}
 	struct pxy_obj_keyring* pxy_obj=(struct pxy_obj_keyring*)(*ad);
 	atomic64_dec(&pxy_obj->ref_cnt);
     if (atomic64_read(&pxy_obj->ref_cnt) == 0)
@@ -1313,9 +1315,12 @@ web_json_record_array_add_string(char **chain)
 
     sample_array = json_object_new_array();
     if (sample_array == NULL)
-        goto finish;
+    {
+		goto finish;
+	}
 
-    for(i = 0; chain[i] != '\0'; i++){
+	for(i = 0; strlen(chain[i]) > 0; i++)
+	{
         json_object_array_add(sample_array, json_object_new_string(chain[i]));
     }
 finish:
@@ -2048,8 +2053,7 @@ redis_link_detection(uint32_t __attribute__((__unused__)) uid,
     }
 }
 
-static int
+static int keyring_server_init()
-keyring_server_init()
 {
     int xret                  = -1;
     unsigned int tid          = 0;