From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 1 Dec 2021 15:40:20 +0000 (-0500)
Subject: %(date:...) should return FR_TYPE_DATE
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=801b27c82fc18f474c3708e0e23e03685982d2ee;p=thirdparty%2Ffreeradius-server.git

%(date:...) should return FR_TYPE_DATE
---

diff --git a/src/modules/rlm_date/rlm_date.c b/src/modules/rlm_date/rlm_date.c
index 740f18a5120..543e673f1ac 100644
--- a/src/modules/rlm_date/rlm_date.c
+++ b/src/modules/rlm_date/rlm_date.c
@@ -100,8 +100,8 @@ static xlat_action_t date_convert_string(TALLOC_CTX *ctx, fr_dcursor_t *out, req
 		return XLAT_ACTION_FAIL;
 	}
 
-	vb = fr_value_box_alloc(ctx, FR_TYPE_UINT64, NULL, false);
-	vb->vb_uint64 = (uint64_t) date;
+	vb = fr_value_box_alloc(ctx, FR_TYPE_DATE, NULL, false);
+	vb->vb_date = fr_unix_time_from_sec(date);
 	fr_dcursor_append(out, vb);
 	return XLAT_ACTION_DONE;
 }
diff --git a/src/tests/keywords/date b/src/tests/keywords/date
index 7eeb880b6bf..daa1c9f0fac 100644
--- a/src/tests/keywords/date
+++ b/src/tests/keywords/date
@@ -19,7 +19,7 @@ if (&Tmp-String-0 != "Fri 22 Sep 17:25:00 GMT 2017") && (&Tmp-String-0 != "Fri 2
 
 # Convert string to integer
 update request {
-	&Tmp-Integer-1 := %(date:%{Tmp-String-0})
+	&Tmp-Integer-1 := %(integer:%(date:%{Tmp-String-0}))
 }
 
 if (&Tmp-Integer-1 != &Tmp-Integer-0) {
@@ -42,7 +42,7 @@ update request {
 }
 
 update request {
-	&Tmp-Integer-2 := "%(sqldate:%{Tmp-String-2})"
+	&Tmp-Integer-2 := %(integer:%(sqldate:%{Tmp-String-2}))
 }
 
 if (&Tmp-Integer-2 != &Tmp-Integer-0) {