Commit Graph

785 Commits

Author SHA1 Message Date
jmc
496146dda9 Work around the fact opaque_t gets defined by sys/properties.h and could be
pulled in via MD includes from sys/param.h.
2004-11-28 11:15:26 +00:00
wiz
b81f308085 Fix typo in formatting. 2004-11-27 23:23:26 +00:00
christos
ccc24aa67e fix merge botches. 2004-11-27 01:39:50 +00:00
christos
763bdaa346 Resolve conflicts. 2004-11-27 01:24:35 +00:00
christos
f8d5cae651 from 20040916 from ftp.am-utils.org 2004-11-27 01:00:29 +00:00
peter
f7da5a456d Apply a patch from the OPENBSD_3_6 branch, ok itojun.
MFC:
Fix by dhartmei@

do not assume entries in pf_timeouts[] are ordererd like PFTM_* in pfvar.h
reported by Alexey E. Suslikov
2004-11-21 18:01:14 +00:00
darrenr
f3736130c9 Fix a regression from 3.4 behaviour where the destination of a redirect rule
could be either a hostname or an IP address (now it can only be an IP#)
2004-11-21 03:44:59 +00:00
wiz
c1c81c7612 Sort options in usage, add missing "]" (OpenBSD v1.38). 2004-11-19 20:52:10 +00:00
wiz
d0b9170efe Sort option descriptions (OpenBSD v1.42). 2004-11-19 20:51:34 +00:00
yamt
057eb0b30f don't use variable arg macro, which is not supported by gcc2. 2004-11-16 05:14:12 +00:00
yamt
23c8222edb merge after importing pf from openbsd 3.6. (userland part)
some files were imported to the different places from the previous version.
v3_5:
	etc/pf.conf
	etc/pf.os
	etc/spamd.conf
	share/man/man4/pf.4
	share/man/man4/pflog.4
	share/man/man5/pf.conf.5
	share/man/man5/pf.os.5
	share/man/man5/spamd.conf.5
v3_6:
	dist/pf/etc/pf.conf
	dist/pf/etc/pf.os
	dist/pf/etc/spamd.conf
	dist/pf/share/man/man4/pf.4
	dist/pf/share/man/man4/pflog.4
	dist/pf/share/man/man5/pf.conf.5
	dist/pf/share/man/man5/pf.os.5
	dist/pf/share/man/man5/spamd.conf.5
2004-11-14 11:26:43 +00:00
yamt
533d14a1b9 import pf from OpenBSD 3.6. (userland part) 2004-11-14 11:08:58 +00:00
he
2befd828c2 Remove declaration of unused "cksum" variable. 2004-11-13 22:28:49 +00:00
he
4a9ab9770a Apply patch from Darren for the ctype() functions/macros.
Encapsulates the ctype() functions so that the casts are centralized.
2004-11-13 19:14:48 +00:00
he
76d82c7f1f Revert previous, paving the way for Darren's cleaner patch. 2004-11-13 18:43:49 +00:00
he
a46d912ed3 More instances of casts to usngiend char for the ctype functions.
Will also be sent to maintainer for inclusion in original.
2004-11-13 15:18:41 +00:00
he
29d6827a49 Add casts to unsigned char for arguments to ctype functions.
Note to be sent to Darren Reed for possible inclusion in master sources.
2004-11-13 14:36:29 +00:00
christos
98d928d598 Apply a patch from the head of file for a printf argument mis-match. 2004-11-13 10:18:50 +00:00
yamt
ce23bf1813 reduce diffs from the original, using dummy impl. of openlog_r and syslog_r. 2004-11-11 11:27:34 +00:00
yamt
93086a3d8d revert a function rename/move.
this kind of change is not appropriate for sources under dist/.
2004-11-11 09:49:59 +00:00
christos
27fcc8bc02 2 more include files. 2004-11-07 17:25:38 +00:00
christos
b69331bf9c Update instructions and include helper scripts 2004-11-07 01:26:10 +00:00
christos
efbc48848e Resolve conflicts 2004-11-07 00:16:59 +00:00
christos
dfd98c8a16 Import bind-9.3.0 2004-11-06 23:53:21 +00:00
dsl
968ad08000 Stop argument to ctype function being char 2004-10-30 15:01:32 +00:00
darrenr
541f8060fe In going from 3.4.x to 4.1.x, "state-age" became "age" but the input grammar
did not allow for backwards compatibility.

PR: kern/27590
2004-10-30 13:33:58 +00:00
dsl
cfe7f80ff0 Add (unsigned char) cast to ctype functions 2004-10-29 20:51:11 +00:00
dsl
238960af7e Add (unsigned char) cast to ctype function 2004-10-29 19:51:36 +00:00
dsl
26207dda78 Add (unsigned char) cast to ctype functions 2004-10-29 19:46:27 +00:00
dsl
91d3fe12d9 Add (unsigned char) cast to ctype function 2004-10-29 19:15:20 +00:00
dsl
31d993f26a Use (unsigned char) not & 0xff on args to ctype functions 2004-10-28 20:52:20 +00:00
dsl
0cb35e8cae Mask 'char' arguments to ctype functions with 0xff, an (int) cast doesn't
solve the problem of charcter codes 0x80..0xff
2004-10-27 20:26:26 +00:00
perry
808ab1197e Use packet length from IP header instead of packet length from BPF
header.
Patches given to me by Ted Lemon.
This avoids using potentially garbage data returned if the ethernet
driver returns a packet that's too long.
2004-10-22 05:22:39 +00:00
christos
72f840350f PR/27210: Paul Shupak: "ntpd"'s NEMA driver has 8 units, but MAX_UNITS
is #defined as 4.
2004-10-10 22:13:04 +00:00
christos
766798b654 PR/27137: Martin J. Laubach: core dump when localhost does not support
a given address family and a peer only supports the family localhost does
not support. For example: configure a kernel without IPV6, and then
add a line in ntp.conf server <ipv6addr>. We report that the server is
unreachable and we keep going because there might be more servers around?
XXX: What if it is the last server? Should we detect this? It is not nice
to just bail on this error, because a server might lose its ipv4 address
and only advertise ipv6.
2004-10-05 03:34:38 +00:00
darrenr
346ea4671b Fix bin/25972 and actually add a token to generate the value IPNY_TCPUDP
as expected by the grammar.
2004-10-03 20:37:17 +00:00
darrenr
857c5d7740 kern/27086 (should be bin/27086) - the "keep options" only allow one order,
not both as they should for proper backwards compatibility.
2004-10-03 20:18:49 +00:00
he
d2886cb438 Fix build problem for hpcarm by casting the result of a computation
to int before printing with %d.
2004-09-28 12:27:02 +00:00
dyoung
79eff8033d Add radiotap support, which was not in release 3.8.3. 2004-09-28 00:01:02 +00:00
dyoung
88f1d7df8c Resolve conflicts in tcpdump-3.8.3 import. 2004-09-27 23:04:24 +00:00
dyoung
64657f857f sync with 3.8.3 2004-09-27 17:06:28 +00:00
martti
dd39bdf1e1 Allow \ at the end of line so long lines can be splitted and made more
readable. Without this modification old IPF 3.x and 4.1.1 rules will not
work with IPF 4.1.3. Patch from Darren Reed.
2004-09-27 08:23:15 +00:00
pooka
d22e9f2216 conflict therapy 2004-09-16 13:49:07 +00:00
pooka
1eb570c83b file 4.10
minor fixes and improvements
2004-09-16 13:43:21 +00:00
tshiozak
f7d656a488 revert the last all changes related to iconv(3). 2004-08-02 13:38:21 +00:00
tshiozak
ab8d4be7c6 make sure that the iconv(3) follows the POSIX specification;
change the 2nd argument from "const char ** restrict" to "char ** restrict".
2004-08-01 16:40:58 +00:00
martti
87c4b6357b Sync with official IPF 2004-07-23 07:18:14 +00:00
martti
a17d8fa0a5 Not needed in NetBSD 2004-07-23 05:42:27 +00:00
martti
7ff15b917f Upgraded IPFilter to 4.1.3 2004-07-23 05:39:03 +00:00
martti
9e82a8bf0d Import IPFilter 4.1.3 2004-07-23 05:33:55 +00:00