Globbing across directories is not supported. Fixes #1149.

The rest of the "filename_work" code assumes that the detail.work
file is in the same directory as the files being globbed.  In order
to support globbing for directories, the code will have to be updated
to *not* open detail.work, but instead to do a *second* file
globbing() on .../*/detail.work, in order to get the real filename
of the detail.work file.

In the short term it's easier to just enforce the assumptions
in the rest of the code.

diff --git a/src/main/detail.c b/src/main/detail.c
index 57c5f0019ab110ca68169ee9c9eda51a22aa0bdf..64625331c8d2d0f6cb6b236418c559d0093b32dd 100644 (file)
--- a/src/main/detail.c
+++ b/src/main/detail.c
@@ -1151,6 +1151,16 @@ int detail_parse(CONF_SECTION *cs, rad_listen_t *this)
                } else {
                        buffer[0] = '\0';
                }
+
+               /*
+                *      Globbing cannot be done across directories.
+                */
+               if ((strchr(buffer, '*') != NULL) ||
+                   (strchr(buffer, '[') != NULL)) {
+                       cf_log_err_cs(cs, "Wildcard directories are not supported");
+                       return -1;
+               }
+
                strlcat(buffer, "detail.work",
                        sizeof(buffer) - strlen(buffer));