]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Test both MIT KRB5 and Heimdal.
authorDarren Tucker <dtucker@dtucker.net>
Fri, 22 Oct 2021 11:54:33 +0000 (22:54 +1100)
committerDarren Tucker <dtucker@dtucker.net>
Fri, 22 Oct 2021 11:54:33 +0000 (22:54 +1100)
.github/configs
.github/setup_ci.sh
.github/workflows/c-cpp.yml

index 90401c9ddc474f97e9afe6b0855f6c4a7e0919a8..339459bf022b1b66a9120c0219fb3c61ee2bf73b 100755 (executable)
@@ -56,7 +56,7 @@ case "$config" in
     tcmalloc)
        CONFIGFLAGS="--with-ldflags=-ltcmalloc"
        ;;
-    kerberos5)
+    krb5|heimdal)
        CONFIGFLAGS="--with-kerberos5"
        ;;
     libedit)
index 4ffb3b99ecadf341ca1f1d520e7dd51375d259ca..2d1943c37f4ce65576de10f65dc04e325485f2d4 100755 (executable)
@@ -41,9 +41,11 @@ for TARGET in $TARGETS; do
         compiler=$(echo $TARGET | sed 's/-Werror//')
         PACKAGES="$PACKAGES $compiler"
         ;;
-    kerberos5)
+    krb5)
+        PACKAGES="$PACKAGES libkrb5-dev"
+       ;;
+    heimdal)
         PACKAGES="$PACKAGES heimdal-dev"
-        #PACKAGES="$PACKAGES libkrb5-dev"
         ;;
     sk)
         INSTALL_FIDO_PPA="yes"
index f3f897dcc05acabb3b2b8e8f04fa89645acf9431..768fbc5101d3ca1a511adb70163e5d36e43fc921 100644 (file)
@@ -57,7 +57,8 @@ jobs:
           - { os: ubuntu-latest, configs: openssl-1.1.1_stable } # stable branch
           - { os: ubuntu-latest, configs: openssl-3.0 }          # stable branch
           - { os: ubuntu-18.04, configs: pam }
-          - { os: ubuntu-18.04, configs: kerberos5 }
+          - { os: ubuntu-18.04, configs: krb5 }
+          - { os: ubuntu-18.04, configs: heimdal }
           - { os: ubuntu-18.04, configs: libedit }
           - { os: ubuntu-18.04, configs: sk }
           - { os: ubuntu-18.04, configs: selinux }