Ollivier Robert 4a0fa52fa0 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
2004-07-20 15:18:31 +00:00
..
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2004-07-20 15:01:56 +00:00
2002-11-04 19:36:11 +00:00