summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/krb5/os/ChangeLog6
-rw-r--r--src/lib/krb5/os/ustime.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index c754ca46a..c6edc6d64 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,9 @@
+Thu Apr 11 22:15:44 1996 Theodore Y. Ts'o <tytso@dcl>
+
+ * ustime.c (krb5_us_timeofday): When doing the time offset
+ adjustments, make sure the microseconds field doesn't go
+ negative.
+
Thu Mar 28 17:20:12 1996 Theodore Y. Ts'o <tytso@dcl>
* DNR.c: Replace eight-year-old version of this file with the
diff --git a/src/lib/krb5/os/ustime.c b/src/lib/krb5/os/ustime.c
index 9fd9dd726..ee7535324 100644
--- a/src/lib/krb5/os/ustime.c
+++ b/src/lib/krb5/os/ustime.c
@@ -53,6 +53,10 @@ krb5_us_timeofday(context, seconds, microseconds)
usec -= 1000000;
sec++;
}
+ if (usec < 0) {
+ usec += 1000000;
+ sec--;
+ }
sec += os_ctx->time_offset;
}
*seconds = sec;