summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/lib/time.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/time.c b/source3/lib/time.c
index ad6b04484c..4eb508115d 100644
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -457,19 +457,19 @@ char *timestring(void )
#ifdef NO_STRFTIME
fstrcpy(TimeBuf, asctime(tm));
#elif defined(CLIX) || defined(CONVEX)
- strftime(TimeBuf,100,"%m/%d/%y %I:%M:%S %p",tm);
+ strftime(TimeBuf,100,"%m/%d/%Y %I:%M:%S %p",tm);
#elif defined(AMPM)
- strftime(TimeBuf,100,"%D %r",tm);
+ strftime(TimeBuf,100,"%m/%d/%Y %r",tm);
#elif defined(TZ_TIME)
{
int zone = TimeDiff(t);
int absZoneMinutes = (zone<0 ? -zone : zone) / 60;
- size_t len = strftime(TimeBuf,sizeof(TimeBuf)-6,"%D %T",tm);
+ size_t len = strftime(TimeBuf,sizeof(TimeBuf)-6,"%m/%d/%Y %T",tm);
sprintf(TimeBuf+len," %c%02d%02d",
zone<0?'+':'-',absZoneMinutes/60,absZoneMinutes%60);
}
#else
- strftime(TimeBuf,100,"%D %T",tm);
+ strftime(TimeBuf,100,"%m/%d/%Y %T",tm);
#endif
return(TimeBuf);
}