From: Arran Cudbard-Bell Date: Mon, 6 Sep 2021 21:54:58 +0000 (-0500) Subject: Fix a couple more issues... X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27c74ea20e49bf3b6719166b86f96ceb8790100e;p=thirdparty%2Ffreeradius-server.git Fix a couple more issues... --- diff --git a/.github/workflows/ci-deb.yml b/.github/workflows/ci-deb.yml index a5839d4a8aa..bccb2ee4734 100644 --- a/.github/workflows/ci-deb.yml +++ b/.github/workflows/ci-deb.yml @@ -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 - diff --git a/src/modules/rlm_files/rlm_files.c b/src/modules/rlm_files/rlm_files.c index 035c4e9ef20..ffa3c7760f6 100644 --- a/src/modules/rlm_files/rlm_files.c +++ b/src/modules/rlm_files/rlm_files.c @@ -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;