diff options
| author | delphij <delphij@FreeBSD.org> | 2016-04-27 15:24:33 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2016-04-27 15:24:33 +0000 |
| commit | 392e7b947908b8f2f5662788d4243ccdfedad371 (patch) | |
| tree | 83286d42b0265ff252ce801f09f05ec4ccf9e7e6 /contrib/ntp/libntp/work_fork.c | |
| parent | 1df61c536d8a0f5edc0372de71d890814b9b277a (diff) | |
| download | FreeBSD-src-392e7b947908b8f2f5662788d4243ccdfedad371.zip FreeBSD-src-392e7b947908b8f2f5662788d4243ccdfedad371.tar.gz | |
MFC r298695: 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
Diffstat (limited to 'contrib/ntp/libntp/work_fork.c')
| -rw-r--r-- | contrib/ntp/libntp/work_fork.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/ntp/libntp/work_fork.c b/contrib/ntp/libntp/work_fork.c index 96c550e..6c9545a 100644 --- a/contrib/ntp/libntp/work_fork.c +++ b/contrib/ntp/libntp/work_fork.c @@ -451,7 +451,7 @@ fork_blocking_child( } } -#ifdef HAVE_DROPROOT +#if defined(HAVE_DROPROOT) && !defined(NEED_EARLY_FORK) /* defer the fork until after root is dropped */ if (droproot && !root_dropped) return; @@ -540,6 +540,11 @@ fork_blocking_child( } +void worker_global_lock(int inOrOut) +{ + (void)inOrOut; +} + #else /* !WORK_FORK follows */ char work_fork_nonempty_compilation_unit; #endif |
