From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Mon, 17 Sep 2018 08:02:34 +0000 (+0800)
Subject: Make Exfile-Name trigger attribute work again
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfd54c7bd6b58e6e82af0938bbffcd36ea97307e;p=thirdparty%2Ffreeradius-server.git

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 80352d76539..253cebf45e6 100644
--- 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);
 }