diff options
author | Xin LI <delphij@FreeBSD.org> | 2016-04-27 07:46:38 +0000 |
---|---|---|
committer | Xin LI <delphij@FreeBSD.org> | 2016-04-27 07:46:38 +0000 |
commit | 4990d495fcc77c51b3f46c91ba3a064b565afae0 (patch) | |
tree | 89c803d8ff6ef95cafc2a4cb08de66848195099a /contrib/ntp/include/ntp_refclock.h | |
parent | 0fbe6eaef6fbb001b91bd8a57a9b3817c1b07b24 (diff) | |
parent | c1950318d1af96666bb3a80bf73cb4790f6dbcea (diff) | |
download | src-4990d495fcc77c51b3f46c91ba3a064b565afae0.tar.gz src-4990d495fcc77c51b3f46c91ba3a064b565afae0.zip |
MFV r298691:
ntp 4.2.8p7.
Security: CVE-2016-1547, CVE-2016-1548, CVE-2016-1549, CVE-2016-1550
Security: CVE-2016-1551, CVE-2016-2516, CVE-2016-2517, CVE-2016-2518
Security: CVE-2016-2519
Security: FreeBSD-SA-16:16.ntp
With hat: so
Notes
Notes:
svn path=/head/; revision=298695
Diffstat (limited to 'contrib/ntp/include/ntp_refclock.h')
-rw-r--r-- | contrib/ntp/include/ntp_refclock.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/ntp/include/ntp_refclock.h b/contrib/ntp/include/ntp_refclock.h index b264dfaa0d1a..4b807e5f369e 100644 --- a/contrib/ntp/include/ntp_refclock.h +++ b/contrib/ntp/include/ntp_refclock.h @@ -105,7 +105,8 @@ struct refclockio { int active; /* nonzero when in use */ #ifdef HAVE_IO_COMPLETION_PORT - void * device_context; /* device-related data for i/o subsystem */ + void * ioreg_ctx; /* IO registration context */ + void * device_ctx; /* device-related data for i/o subsystem */ #endif }; |