Merge branch 'v3.x/staging' into v2.x/feature/tlsDebug

.github/workflows/build-configmgr.yml

@@ -1,10 +1,15 @@
 name: Build configmgr
+permissions:
+  id-token: write
+  issues: write
+  pull-requests: write
+  contents: write
 on:
   push:
     branches:
-      - v2.x/staging 
-      - v2.x/master
-      - v2.x/rc 
+      - v3.x/staging 
+      - v3.x/master
+      - v3.x/rc 
   pull_request:
     types: [opened, reopened, synchronize]
   workflow_dispatch:
@@ -173,7 +178,7 @@ jobs:
 
       - name: '[Prep Release] Bump version'
         if: ${{ github.event.inputs.PERFORM_RELEASE == 'true' }}
-        uses: zowe-actions/zlux-builds/bump-zis-version@v2.x/main
+        uses: zowe-actions/zlux-builds/bump-zis-version@v3.x/main
         with:
           version: 'MINOR'
         env: 

.github/workflows/build-getesm.yml

@@ -1,10 +1,12 @@
 name: Build getesm
+permissions:
+  id-token: write
+  issues: write
+  pull-requests: write
+  contents: write
 on:
   push:
-    branches:
-      - v2.x/staging 
-      - v2.x/master
-      - v2.x/rc       
+    branches:   
       - v3.x/staging 
       - v3.x/master
       - v3.x/rc 
@@ -74,11 +76,3 @@ jobs:
           publish-target-path-pattern: libs-snapshot-local/org/zowe/getesm/${{ steps.version.outputs.version }}-${{ steps.branch.outputs.branch }}
           publish-target-file-pattern: getesm-${{ steps.version.outputs.version }}-${{ steps.date.outputs.date }}.pax
           perform-release: ${{ github.event.inputs.PERFORM_RELEASE }}
-
-      - name: '[Prep Release] Bump version'
-        if: ${{ github.event.inputs.PERFORM_RELEASE == 'true' }}
-        uses: zowe-actions/zlux-builds/[email protected]/main
-        with:
-          version: 'MINOR'
-        env: 
-         GITHUB_TOKEN: ${{ secrets.ZOWE_ROBOT_TOKEN }}

.github/workflows/build-rexxconfigmgr.yml

@@ -1,10 +1,15 @@
 name: Build REXX configmgr
+permissions:
+  id-token: write
+  issues: write
+  pull-requests: write
+  contents: write
 on:
   push:
     branches:
-      - v2.x/staging 
-      - v2.x/master
-      - v2.x/rc 
+      - v3.x/staging 
+      - v3.x/master
+      - v3.x/rc 
   pull_request:
     types: [opened, reopened, synchronize]
   workflow_dispatch:

CHANGELOG.md

@@ -1,10 +1,30 @@
 # Zowe Common C Changelog
 
+## `3.1.0`
+- Bugfix: removed "ByteOutputStream" debug message, which was part of the `zwe` command output (#491)
+- Bugfix: HEAPPOOLS and HEAPPOOLS64 no longer need to be set to OFF for configmgr (#497)
+- Enhancement: module registry (#405)
+- Enhancement:  Adding more arguments to httpClientSessionInit to allow passing back internal rc and
+  removing the reference from changelog in `3.0.0`. (#499).
+- Bugfix: make sure CEE3ERP is invoked in LE 31-bit XPLINK (#504)
+
+## `3.0.0`
+- Feature: added javascript `zos.getStatvfs(path)` function to obtain file system information (#482).
+- Add support for LE 64-bit in isgenq.c (#422).
+- Bugfix: IARV64 results must be checked for 0x7FFFF000 (#474)
+- Bugfix: SLH should not ABEND when MEMLIMIT is reached (additional NULL check)
+- Bugfix: support cross-memory server parameters longer than 128 characters 
+  (zowe/zss#684)
+
+## `2.18.0`
+- Minor `components.zss.logLevels._zss.httpserver=5` debug messages enhancement (#471)
+
 ## `2.17.0`
 - Fixed `xplatform.loadFileUTF8` when trying to open nonexistent file (#454)
 - Bugfix: fix an incorrect check in the recovery router code which might lead to
   the state cell-pool being released prematurely (#446)
 - Allocating SLH for http server with configurable value 'httpRequestHeapMaxBlocks' in yaml (#447).
+- Return error when last config file is non existent or has some error (#460).
 
 ## `2.16.0`
 - No yaml value converted to null (#442)

build/build_cmgr_xlclang.sh

@@ -100,6 +100,7 @@ xlclang \
   -D_OPEN_THREADS=1 \
   -DNOIBMHTTP=1 \
   -DUSE_ZOWE_TLS=1 \
+  -DNEW_CAA_LOCATIONS=1 \
   -DCMGRTEST=1 \
   -I "${COMMON}/h" \
   -I "${COMMON}/platform/posix" \

build/configmgr.proj.env

@@ -1,5 +1,5 @@
 PROJECT="configmgr"
-VERSION=2.18.0
+VERSION=3.1.0
 DEPS="QUICKJS LIBYAML"
 
 QUICKJS="quickjs"

build/getesm.proj.env

@@ -1,3 +1,3 @@
 PROJECT="getesm"
-VERSION=2.18.0
+VERSION=3.1.0
 DEPS=""

c/alloc.c

@@ -181,7 +181,12 @@ static char* __ptr64 getmain64(long long sizeInMegabytes, int *returnCode, int *
 
    if (returnCode) *returnCode = macroRetCode;
    if (reasonCode) *reasonCode = macroResCode;
-
+
+  // IARV64 returns 0x7FFFF000 when MEMLIMIT is reached
+  if (data == (void *)0x7FFFF000) {
+    data = NULL;
+  }
+
    return data;
 
 }
@@ -202,7 +207,12 @@ static char* __ptr64 getmain64ByToken(long long sizeInMegabytes, long long token
 
   if (returnCode) *returnCode = macroRetCode;
   if (reasonCode) *reasonCode = macroResCode;
-
+
+  // IARV64 returns 0x7FFFF000 when MEMLIMIT is reached
+  if (data == (void *)0x7FFFF000) {
+    data = NULL;
+  }
+
   return data;
 
 }

c/configmgr.c

@@ -827,6 +827,9 @@ static int overloadConfiguration(ConfigManager *mgr,
     trace(mgr, DEBUG2, "at end of config path\n");
     bool dontCare = false;
     config->configData = readJson(mgr,config,pathElement,&dontCare);
+    if ((config->configData == NULL) && !dontCare){
+      return ZCFG_MISSING_CONFIG_SOURCE;
+    }
     trace(mgr, DEBUG2, "mgr->config = 0x%p\n", config);
     return 0; /* success */
   } else {
@@ -1672,7 +1675,7 @@ static int simpleMain(int argc, char **argv){
 
   while (argx < argc){
     char *optionValue = NULL;
-    if (getStringOption(argc,argv,&argx,"-h")){
+    if (strcmp(argv[argx], "-h") == 0) {
       showHelp(traceOut);
       return 0;
     } else if ((optionValue = getStringOption(argc,argv,&argx,"-s")) != NULL){