Remove microseconds from %S. Closes #1934

diff --git a/src/main/xlat.c b/src/main/xlat.c
index 31987289c73ad3b1b7243566a074e6456d33389a..66ce9134b2653bfc189048ef5d1ad4fbffb5b9ee 100644 (file)
--- a/src/main/xlat.c
+++ b/src/main/xlat.c
@@ -2197,15 +2197,14 @@ static char *xlat_aprint(TALLOC_CTX *ctx, REQUEST *request, xlat_exp_t const * c
 
                case 'S': /* request timestamp in SQL format*/
                        if (!localtime_r(&when, &ts)) goto error;
-                       nl = str + strftime(str, freespace, "%Y-%m-%d %H:%M:%S", &ts);
-                       rad_assert(((str + freespace) - nl) >= 8);
-                       snprintf(nl, (str + freespace) - nl, ".%06d",  usec);
+                       strftime(str, freespace, "%Y-%m-%d %H:%M:%S", &ts);
                        break;
 
                case 'T': /* request timestamp */
                        if (!localtime_r(&when, &ts)) goto error;
-                       strftime(str, freespace, "%Y-%m-%d-%H.%M.%S", &ts);
-                       
+                       nl = str + strftime(str, freespace, "%Y-%m-%d-%H.%M.%S", &ts);
+                       rad_assert(((str + freespace) - nl) >= 8);
+                       snprintf(nl, (str + freespace) - nl, ".%06d",  usec);
                        break;
 
                case 'Y': /* request year */