diff options
| author | mjacob <mjacob@FreeBSD.org> | 1999-04-07 17:32:21 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 1999-04-07 17:32:21 +0000 |
| commit | 32c3652183b8a0a36d2ca88e7e71b7276250bae4 (patch) | |
| tree | 033a39c526cc1e120d6c6a77d10a0529c0d3027a /sys/kern/kern_time.c | |
| parent | 2680ced1707f3ed798cf6c3a77a5fda48f62cdde (diff) | |
| download | FreeBSD-src-32c3652183b8a0a36d2ca88e7e71b7276250bae4.zip FreeBSD-src-32c3652183b8a0a36d2ca88e7e71b7276250bae4.tar.gz | |
Fix last delta so file would compile again- I think I got it
right. Add a clarifying (to me at least) comment. Some formatting
fixes.
Diffstat (limited to 'sys/kern/kern_time.c')
| -rw-r--r-- | sys/kern/kern_time.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c index c699c22..15eed4a 100644 --- a/sys/kern/kern_time.c +++ b/sys/kern/kern_time.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_time.c 8.1 (Berkeley) 6/10/93 - * $Id: kern_time.c,v 1.61 1999/02/25 15:54:05 bde Exp $ + * $Id: kern_time.c,v 1.62 1999/04/07 16:36:56 nsayer Exp $ */ #include <sys/param.h> @@ -97,17 +97,20 @@ settime(tv) */ if (securelevel > 1) { if (delta.tv_sec < 0 || delta.tv_usec < 0) { - if ( tv1.tv_sec > maxtime.tv_sec ) - maxtime=tv1; - tv2=*tv; - timevalsub( &tv2, &maxtime ); - if ( tv2.tv_sec < -1 ) { - tv.tv_sec=maxtime.tv_sec-1; + /* + * Initialize maxtime if we've not seen it before. + */ + if (tv1.tv_sec > maxtime.tv_sec) + maxtime = tv1; + tv2 = *tv; + timevalsub(&tv2, &maxtime); + if (tv2.tv_sec < -1) { + tv->tv_sec = maxtime.tv_sec - 1; printf("Time adjustment clamped to -1 second\n"); } - } - else { - /* XXX + } else { + /* + * XXX * We have to figure out how to be secure * in this case. Allowing arbitrary * positive increases allows a miscreant |
