%(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 740f18a5120f4a4737c9001d598a7d5585ead6fe..543e673f1acfd5e5be75cc92ffdfd3546caaf530 100644 (file)
--- 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 7eeb880b6bf018f81d1a192fe3c4cc36c8ba9930..daa1c9f0facbad7c142dd0a1a41d53a8e99330f6 100644 (file)
--- 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) {