diff options
author | glebius <glebius@FreeBSD.org> | 2015-10-26 11:35:40 +0000 |
---|---|---|
committer | glebius <glebius@FreeBSD.org> | 2015-10-26 11:35:40 +0000 |
commit | c62812877398840dae0ba74b03e9e6a43cc56fc5 (patch) | |
tree | 304551aa93f09787d4f56a966c6409faf1b1bcb0 /contrib/ntp/tests/libntp/test-libntp.c | |
parent | 9e809ce638c9be9ffb800ced1b91c0e8997f4c9e (diff) | |
download | FreeBSD-src-c62812877398840dae0ba74b03e9e6a43cc56fc5.zip FreeBSD-src-c62812877398840dae0ba74b03e9e6a43cc56fc5.tar.gz |
Upgrade NTP to 4.2.8p4.
Security: FreeBSD-SA-15:25.ntp
Security: CVE-2015-7871
Security: CVE-2015-7855
Security: CVE-2015-7854
Security: CVE-2015-7853
Security: CVE-2015-7852
Security: CVE-2015-7851
Security: CVE-2015-7850
Security: CVE-2015-7849
Security: CVE-2015-7848
Security: CVE-2015-7701
Security: CVE-2015-7703
Security: CVE-2015-7704, CVE-2015-7705
Security: CVE-2015-7691, CVE-2015-7692, CVE-2015-7702
Diffstat (limited to 'contrib/ntp/tests/libntp/test-libntp.c')
-rw-r--r-- | contrib/ntp/tests/libntp/test-libntp.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/contrib/ntp/tests/libntp/test-libntp.c b/contrib/ntp/tests/libntp/test-libntp.c index e489f673..4d9b840 100644 --- a/contrib/ntp/tests/libntp/test-libntp.c +++ b/contrib/ntp/tests/libntp/test-libntp.c @@ -5,28 +5,23 @@ #include "test-libntp.h" -//const char *progname = "test-libntp"; - -// current_time is needed by authkeys. Used only in to calculate lifetime. -//u_long current_time = 4; - time_t nowtime = 0; -time_t timefunc(time_t *ptr) -{ + +time_t +timefunc(time_t *ptr) { if (ptr) *ptr = nowtime; return nowtime; } -void settime(int y, int m, int d, int H, int M, int S) -{ + +void +settime(int y, int m, int d, int H, int M, int S) { time_t days = ntpcal_edate_to_eradays(y-1, m-1, d-1) + 1 - DAY_UNIX_STARTS; time_t secs = ntpcal_etime_to_seconds(H, M, S); nowtime = days * SECSPERDAY + secs; } - - |