From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 8 Mar 2017 14:22:47 +0000 (-0500)
Subject: Remove microseconds from %S.  Closes #1934
X-Git-Tag: release_3_0_14~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=043cf6d45531279aa0eeeec6d7442af74030b66a;p=thirdparty%2Ffreeradius-server.git

Remove microseconds from %S.  Closes #1934
---

diff --git a/src/main/xlat.c b/src/main/xlat.c
index 31987289c73..66ce9134b26 100644
--- 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 */