From 4bb4f1601e0776e71cfca50aae3680eb0771e2d0 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Mon, 23 Mar 2026 17:50:40 +1100 Subject: [PATCH] Add a Valgrind test of the PAM config. --- .github/configs | 8 ++++++-- .github/workflows/c-cpp.yml | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/configs b/.github/configs index 8ee0f9878..9ad2439df 100755 --- a/.github/configs +++ b/.github/configs @@ -208,10 +208,14 @@ case "$config" in LIBCRYPTOFLAGS="--without-openssl" TEST_TARGET=t-exec ;; - valgrind-[1-4]|valgrind-unit) + valgrind-[1-4]|valgrind-unit|valgrind-pam-1) # rlimit sandbox and FORTIFY_SOURCE confuse Valgrind. CONFIGFLAGS="--without-sandbox --without-hardening" CONFIGFLAGS="$CONFIGFLAGS --with-cppflags=-D_FORTIFY_SOURCE=0" + if [ "${config}" = "valgrind-pam-1" ]; then + CONFIGFLAGS="$CONFIGFLAGS --with-pam" + SSHD_CONFOPTS="UsePam yes" + fi TEST_TARGET="t-exec USE_VALGRIND=1" TEST_SSH_ELAPSED_TIMES=1 export TEST_SSH_ELAPSED_TIMES @@ -222,7 +226,7 @@ case "$config" in tests3="krl forward-control sshsig agent-restrict kextype sftp" tests4="cert-userkey cert-hostkey kextype sftp-perm keygen-comment percent" case "$config" in - valgrind-1) + valgrind-1|valgrind-pam) # All tests except agent-timeout (which is flaky under valgrind), # connection-timeout (which doesn't work since it's so slow) # and hostbased (since valgrind won't let ssh exec keysign). diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index a132ed87f..02cd10bfb 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -63,6 +63,7 @@ jobs: - { target: ubuntu-22.04, config: valgrind-2 } - { target: ubuntu-22.04, config: valgrind-3 } - { target: ubuntu-22.04, config: valgrind-4 } + - { target: ubuntu-22.04, config: valgrind-pam-1 } - { target: ubuntu-22.04, config: valgrind-unit } - { target: ubuntu-22.04, config: without-openssl } - { target: ubuntu-latest, config: gcc-14 }