]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
more "shut up compiler"
authorAlan T. DeKok <aland@freeradius.org>
Wed, 23 Jul 2025 15:10:07 +0000 (17:10 +0200)
committerAlan T. DeKok <aland@freeradius.org>
Wed, 23 Jul 2025 15:10:07 +0000 (17:10 +0200)
clang scan passes, but the normal compiler complains

src/modules/rlm_dpsk/rlm_dpsk.c

index 96a005953a72ccd8e5522175e94f7784e1176de6..29f3d39a6f94308ca3317d5709f028c7411f91cb 100644 (file)
@@ -301,7 +301,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_authenticate(void *instance, REQUEST *re
        eapol_attr_t const *eapol;
        eapol_attr_t *zeroed;
        FILE *fp = NULL;
-       char const *filename;
+       char const *filename = inst->filename;
        char const *psk_identity = NULL, *psk = NULL;
        uint8_t *p;
        uint8_t const *snonce, *ap_mac;
@@ -523,15 +523,15 @@ stage2:
                char token_mac[256];
                char buffer[1024];
 
-               if (!inst->dynamic) {
-                       filename = inst->filename;
-               } else {
+               if (inst->dynamic) {
                        if (radius_xlat(filename_buffer, sizeof(filename_buffer),
                                        request, inst->filename, NULL, NULL) < 0) {
                                return RLM_MODULE_FAIL;
                        }
 
                        filename = filename_buffer;
+               } else {
+                       fr_assert(filename == inst->filename);
                }
 
                RDEBUG3("Looking for PSK in file %s", filename);