Merge pull request #454 from zowe/v2.x/staging

rc2
zowe · Apr 21, 2022 · 2a06b9b · 2a06b9b
2 parents 316e75a + f397363
commit 2a06b9b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/bin/configure.sh b/bin/configure.sh
@@ -75,8 +75,19 @@ fi
 
 # Keystore settings are used for both https server and Caching Service
 export "${HTTPS_PREFIX}label=${KEY_ALIAS}"
-if [ "${KEYSTORE_TYPE}" = "JCERACFKS" ]; then
-  export "${HTTPS_PREFIX}keyring=${KEYRING_OWNER}/${KEYRING_NAME}"
+
+if [ "${ZWE_zowe_certificate_keystore_type}" = "JCERACFKS" ]; then
+  export "${HTTPS_PREFIX}keyring=${ZWE_zowe_certificate_keystore_file}"
+  case "${ZWE_zowe_certificate_keystore_file}" in
+    safkeyring:////*)
+      trimmed=$(echo $ZWE_zowe_certificate_keystore_file | cut -c 16-)
+      export "${HTTPS_PREFIX}keyring=$trimmed"
+    ;;
+    safkeyring://*)
+      trimmed=$(echo $ZWE_zowe_certificate_keystore_file | cut -c 14-)
+      export "${HTTPS_PREFIX}keyring=$trimmed"
+    ;;
+  esac
 else
   export "${HTTPS_PREFIX}keyring=${KEYSTORE}"
   export "${HTTPS_PREFIX}password=${KEYSTORE_PASSWORD}"

diff --git a/bin/zssServer.sh b/bin/zssServer.sh
@@ -164,15 +164,15 @@ fi
 
 if [ -f "$CONFIG_FILE" ]; then
   if [ "$ZWES_LOG_FILE" = "/dev/null" ]; then
-    _BPX_SHAREAS=NO _BPX_JOBNAME=${ZOWE_PREFIX}SZ1 ${ZSS_SERVER} "${CONFIG_FILE}" 2>&1
+    _BPX_SHAREAS=NO _BPX_JOBNAME=${ZOWE_PREFIX}SZ ${ZSS_SERVER} "${CONFIG_FILE}" 2>&1
   else
-    _BPX_SHAREAS=NO _BPX_JOBNAME=${ZOWE_PREFIX}SZ1 ${ZSS_SERVER} "${CONFIG_FILE}" 2>&1 | tee $ZWES_LOG_FILE
+    _BPX_SHAREAS=NO _BPX_JOBNAME=${ZOWE_PREFIX}SZ ${ZSS_SERVER} "${CONFIG_FILE}" 2>&1 | tee $ZWES_LOG_FILE
   fi
 else
   if [ "$ZWES_LOG_FILE" = "/dev/null" ]; then
-    _BPX_SHAREAS=NO _BPX_JOBNAME=${ZOWE_PREFIX}SZ1 ${ZSS_SERVER} 2>&1
+    _BPX_SHAREAS=NO _BPX_JOBNAME=${ZOWE_PREFIX}SZ ${ZSS_SERVER} 2>&1
   else
-    _BPX_SHAREAS=NO _BPX_JOBNAME=${ZOWE_PREFIX}SZ1 ${ZSS_SERVER} 2>&1 | tee $ZWES_LOG_FILE
+    _BPX_SHAREAS=NO _BPX_JOBNAME=${ZOWE_PREFIX}SZ ${ZSS_SERVER} 2>&1 | tee $ZWES_LOG_FILE
   fi
 fi
 # This program and the accompanying materials are

diff --git a/c/zss.c b/c/zss.c
@@ -1167,13 +1167,8 @@ static void readAgentAddressAndPort(JsonObject *serverConfig, JsonObject *envCon
 static char* generateCookieName(JsonObject *envConfig, int port) {
   int cookieLength=256;
   char *cookieName = safeMalloc(cookieLength+1, "CookieName");
-  char *zoweInstanceId = getenv("ZOWE_INSTANCE");
-  char *haInstanceCountStr = getenv("ZWE_HA_INSTANCES_COUNT");
-  int haInstanceCount=0;
-  if (haInstanceCountStr != NULL) {
-    haInstanceCount = atoi(haInstanceCountStr);
-  }
-  if (haInstanceCount > 1 && zoweInstanceId != NULL) {
+  char *zoweInstanceId = getenv("ZWE_zowe_cookieIdentifier");
+  if (zoweInstanceId != NULL) {
     snprintf(cookieName, cookieLength, "%s.%s", SESSION_TOKEN_COOKIE_NAME, zoweInstanceId);
   } else {
     snprintf(cookieName, cookieLength, "%s.%d", SESSION_TOKEN_COOKIE_NAME, port);

diff --git a/deps/zowe-common-c b/deps/zowe-common-c