Make Exfile-Name trigger attribute work again

This has been an issue for a while.  Present in v3.1.x at least...

diff --git a/src/lib/server/exfile.c b/src/lib/server/exfile.c
index 80352d76539df7930375eafd4672ee9332dd9fdd..253cebf45e645bfb981ffdb888cc0769e7f39d18 100644 (file)
--- a/src/lib/server/exfile.c
+++ b/src/lib/server/exfile.c
@@ -97,8 +97,6 @@ static inline void exfile_trigger_exec(exfile_t *ef, REQUEST *request, exfile_en
 
 static void exfile_cleanup_entry(exfile_t *ef, REQUEST *request, exfile_entry_t *entry)
 {
-       TALLOC_FREE(entry->filename);
-
        if (entry->fd >= 0) close(entry->fd);
 
        entry->hash = 0;
@@ -108,6 +106,11 @@ static void exfile_cleanup_entry(exfile_t *ef, REQUEST *request, exfile_entry_t
         *      Issue close trigger *after* we've closed the fd
         */
        exfile_trigger_exec(ef, request, entry, "close");
+
+       /*
+        *      Trigger still needs access to filename to populate Exfile-Name
+        */
+       TALLOC_FREE(entry->filename);
 }