diff options
author | glebius <glebius@FreeBSD.org> | 2016-01-11 01:09:50 +0000 |
---|---|---|
committer | glebius <glebius@FreeBSD.org> | 2016-01-11 01:09:50 +0000 |
commit | c41fbaf9bc76f0b7650e448fbd88d0a9815f47fd (patch) | |
tree | 3b45c8e63a37b132f0fe10c570b8302052c547de /contrib/ntp/libntp/ntp_worker.c | |
parent | 3066f138bc3bf99f5cf6ec9412903d206c329cc7 (diff) | |
download | FreeBSD-src-c41fbaf9bc76f0b7650e448fbd88d0a9815f47fd.zip FreeBSD-src-c41fbaf9bc76f0b7650e448fbd88d0a9815f47fd.tar.gz |
Merge r293423, r293469:
ntp 4.2.8p5
Relnotes: yes
Diffstat (limited to 'contrib/ntp/libntp/ntp_worker.c')
-rw-r--r-- | contrib/ntp/libntp/ntp_worker.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/ntp/libntp/ntp_worker.c b/contrib/ntp/libntp/ntp_worker.c index 32970da..f5642e1 100644 --- a/contrib/ntp/libntp/ntp_worker.c +++ b/contrib/ntp/libntp/ntp_worker.c @@ -150,7 +150,8 @@ available_blocking_child_slot(void) prev_octets); blocking_children_alloc = new_alloc; - return prev_alloc; + /* assume we'll never have enough workers to overflow u_int */ + return (u_int)prev_alloc; } |