diff options
| author | roberto <roberto@FreeBSD.org> | 2004-07-20 15:18:31 +0000 |
|---|---|---|
| committer | roberto <roberto@FreeBSD.org> | 2004-07-20 15:18:31 +0000 |
| commit | 4155ac9f07c2f1986843c07b428ac66e6f11ffe0 (patch) | |
| tree | 7974d2a5e67d1a45734109ca9bac8efa01728f35 /contrib/top/os.h | |
| parent | cdfc2f45fe8fcd9851febc86a614aa5c097c4323 (diff) | |
| download | FreeBSD-src-4155ac9f07c2f1986843c07b428ac66e6f11ffe0.zip FreeBSD-src-4155ac9f07c2f1986843c07b428ac66e6f11ffe0.tar.gz | |
Merge conflicts (see also previous commit).
Reinsert our local changes to ntp_control.c:
1.4: Do not log every potential exploit attempt since a denial-of-service
may result
1.5: int -> unsigned char fixes
Diffstat (limited to 'contrib/top/os.h')
0 files changed, 0 insertions, 0 deletions
