summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-11-05 17:28:18 +0000
committerTim Potter <tpot@samba.org>2003-11-05 17:28:18 +0000
commitb216846e8f489e1934b457ebd2bfb1a5b4ae62e4 (patch)
tree71ba8d94498115c1a8260e1e48c1c717b0080856 /source3
parent0467255bfed3c80eb1fcbc0ffc17cffb36c6dbfc (diff)
downloadsamba-b216846e8f489e1934b457ebd2bfb1a5b4ae62e4.tar.gz
samba-b216846e8f489e1934b457ebd2bfb1a5b4ae62e4.tar.bz2
samba-b216846e8f489e1934b457ebd2bfb1a5b4ae62e4.zip
Merge from 3.0:
Revision 1.42.2.8: Use the actual size of the buffer in strftime instead of a made up value which just happens to be less than sizeof(fstring). Closes #713. (This used to be commit 45c28f8a2723b5e942d13d1c6e5db757921fb64f)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/time.c b/source3/lib/time.c
index 74ca56bdc5..635ede9be2 100644
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -694,7 +694,7 @@ char *timestring(BOOL hires)
".%06ld",
(long)tp.tv_usec);
} else {
- strftime(TimeBuf,100,"%Y/%m/%d %H:%M:%S",tm);
+ strftime(TimeBuf,sizeof(TimeBuf)-1,"%Y/%m/%d %H:%M:%S",tm);
}
#else
if (hires) {