]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
Fix a couple more issues...
authorArran Cudbard-Bell <a.cudbardb@freeradius.org>
Mon, 6 Sep 2021 21:54:58 +0000 (16:54 -0500)
committerArran Cudbard-Bell <a.cudbardb@freeradius.org>
Mon, 6 Sep 2021 21:54:58 +0000 (16:54 -0500)
.github/workflows/ci-deb.yml
src/modules/rlm_files/rlm_files.c

index a5839d4a8aabee66416420e860a24c3b4cdd2cf5..bccb2ee4734156ca720ecd66768029511683f388 100644 (file)
@@ -211,7 +211,7 @@ jobs:
     # procps for pkill, curl+gnupg2 for apt-key, ca-certificates for curl
     - name: Install system utilities
       run: |
-        apt-get install -y --no-install-recommends procps curl gnupg2 ca-certificates
+        apt-get install -y --no-install-recommends procps curl gnupg2 ca-certificates lsb-release
 
     - name: NetworkRADIUS signing key
       run: curl -sS https://packages.networkradius.com/pgp/packages%40networkradius.com | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=yes apt-key add -
index 035c4e9ef20e45a58c3c6c1f2af4ad0c39851e70..ffa3c7760f6bc7895e462b0ecebafaa2c17e15f6 100644 (file)
@@ -496,7 +496,6 @@ redo:
                                        match = false;
                                        break;
                                }
-                               LIST_VERIFY(&tmp_list);
 
                                fr_pair_list_append(&list, &tmp_list);
                                break;
@@ -594,7 +593,7 @@ redo:
                                        keylen--;
                                        user_list = fr_trie_lookup_by_key(tree->store, key, keylen);
                                        if (!user_list) continue;
-                                       
+
                                        user_pl = fr_dlist_head(&user_list->head);
                                        RDEBUG("Found matching shorter subnet %s at key length %ld", user_pl->name, keylen);
                                        goto redo;