94921da3bb
Changes to build on NetBSD:
...
* #ifdef out some things we don't have or do differently.
* Write struct "pcap_sf_pkthdr" instead of "pcap_pkthdr".
Fixes an LP64 specific problem with reading the pflog with tcpdump(8).
(OpenBSD fixed this by changing the structs to always use 32-bit fields)
Reviewed by yamt@.
2005-03-15 16:26:49 +00:00
0a9aa9779a
Install pf(4) examples. Reviewed by yamt@.
...
Thanks to hubertf@ for the reminder.
2005-03-15 16:05:03 +00:00
e3e9ad241e
Get rid of a compiler warning saying "dereferencing type-punned pointer
...
will break strict-aliasing rules" by casting the argument to rn_inithead()
to (void*) instead of (void**).
2005-03-13 10:44:40 +00:00
b67bc0fbc2
Re-remove superfluous .Pp.
2005-03-04 12:32:31 +00:00
e0ebf94412
Regen.
2005-03-03 02:09:04 +00:00
0711b6123a
Deal with the NUSER addition.
2005-03-03 02:07:07 +00:00
9ec5ce8afc
Add a variable to pass in the nested user.
2005-03-03 02:06:42 +00:00
663b6c2589
Remove superfluous .Pp.
2005-02-28 10:48:08 +00:00
c2c52ef2eb
Resolve conflicts.
2005-02-26 20:58:24 +00:00
4ef1eb92fc
Import feterita from www.openpam.org
2005-02-26 20:44:47 +00:00
85962585ac
Remove inline from rotate_{left,right}. Breaks compilation with gcc-3.3
...
and macppc. It is fixed in gcc-3.4
2005-02-22 18:42:15 +00:00
3748b0d6f7
Add xref to openpam_free_data (for man page).
2005-02-22 15:22:02 +00:00
d2ef6b97b8
Add sections to some functions so xrefs in man page will be correct.
2005-02-22 15:21:26 +00:00
ea9fa3e293
Some fixes:
...
. add RCS Id to generated man pages
. fix for =cleanup (special case for one man page, sorry)
. sort xrefs in SEE ALSO correctly.
2005-02-22 15:20:48 +00:00
cf3e23f3e8
Use Ar for function argument.
2005-02-22 15:15:51 +00:00
1c9b56c830
Add MKIPFILTER; if set to no, don't build and install the ipf(4) programs,
...
headers and LKM.
Add MKPF; if set to no, don't build and install the pf(4) programs,
headers, LKM and spamd.
Both options default to yes, so nothing changed in the default build.
Reviewed by lukem.
2005-02-22 14:39:58 +00:00
fcb550ad2b
Make building a bit more automatic by borrowing the rest of the
...
generated auto-payload from the vendor branch. Now it works.
(and no, this has of course nothing to do with the version 4.*13*,
there are greater powers at play)
2005-02-21 15:25:57 +00:00
ef5d11d8e1
import python also + nuke one extra linefeed when adding RCSId's
2005-02-21 15:25:56 +00:00
2fb3e4a058
Make building a bit more automatic by borrowing the rest of the
...
generated auto-payload from the vendor branch. Now it works.
(and no, this has of course nothing to do with the version 4.*13*,
there are greater powers at play)
2005-02-21 15:25:56 +00:00
373a872a16
autoconf-stuff wants the python-dir when building tools/file, so
...
it's just easier to import this small amount of extra payload than
to attempt a war on autotools.
2005-02-21 15:16:06 +00:00
5b40621389
conflicts
2005-02-21 15:00:04 +00:00
dfba91ada0
file 4.13
...
Just the usual bugfixes and magic additions, nothing major.
2005-02-21 14:32:55 +00:00
4bcbdc6712
Reinstate the ntohs() on port numbers returned bu getport()
2005-02-20 21:44:51 +00:00
5605ab81e0
Do not use bogus (long) casts and ntohl() on port numbers.
...
Only test for -1 error return from getport().
2005-02-20 21:15:37 +00:00
b061c59389
Fix some xrefs.
2005-02-20 19:34:40 +00:00
c952b0b731
FreeBSD -> .Fx.
2005-02-20 19:33:59 +00:00
85c561fa24
Drop superfluous .Pp.
2005-02-20 19:33:39 +00:00
0ebd8f8b30
Fix xrefs.
2005-02-20 19:30:51 +00:00
f0d89116f5
Add RCS Id.
2005-02-20 19:27:58 +00:00
bd797f6b31
We don't want README.sol2 next time.
2005-02-20 10:51:52 +00:00
d62a80864e
Add a helper script for future pppd import.
2005-02-20 10:51:07 +00:00
2b974d094e
Bring in the diffs we had against the previous versions of pppd.
...
That includes:
o Manpage fixes
o to{lower,upper,whatever} fixes
o strl* use
o use of getopt() in chat(8)
o use of NetBSD's md5 and sha1 APIs
o support for utmp and utmpx
o a slightly different way of handling active and pass filters, to
avoid depend on "inbound" and "outbound" keywords of libpcap
o addition of plug-in hooks for LCP
o use of the former TDB code (ppp-2.4.3 uses a GPL version, which
was removed prior to the import)
o changes in the compressor API.
2005-02-20 10:47:16 +00:00
ee7ef76378
Import of pppd 2.4.3 (ppp-2.4.3), with GPL'd components removed as well as
...
things we won't use. OK'd by christos.
2005-02-20 10:28:32 +00:00
460bbcc960
Upgraded IPFilter to 4.1.6
2005-02-19 21:30:24 +00:00
76b5d9e30f
Import IPFilter 4.1.6
2005-02-19 21:26:02 +00:00
fdf846c8d1
REMOVED
2005-02-08 07:20:11 +00:00
a023cb1d19
Upgraded IPFilter to 4.1.5
2005-02-08 07:01:52 +00:00
4d6a62d250
Import IPFilter 4.1.5
2005-02-08 06:52:59 +00:00
d48b4dc8c5
Regen.
2005-02-01 17:53:07 +00:00
192f3d9e5a
Add a PAM_SOCKADDR extension so that we can pass the socket address
...
of the host we logged in from to the lastlog module.
2005-02-01 17:51:01 +00:00
4f025fd3d0
Protect alarm(0) the same way we protected the other alarm calls.
...
From Dag-Erling Sm=F8rgrav
2005-02-01 13:20:25 +00:00
3d34ee60f0
fix CERT VU#938617 (vulnerable to denial of service in validator code)
...
ftp://ftp.isc.org/isc/bind/9.3.0/9.3.0-patch1
2005-01-27 03:56:23 +00:00
959a1400b9
Remove duplicate description for -d. From Chris Ross in PR 29035.
2005-01-21 15:10:16 +00:00
83aa569ca0
allow to escape newline in string literals.
...
(being compatible with solaris /usr/xpg4/bin/awk and GNU awk.)
2005-01-13 12:10:02 +00:00
0e59802be5
Fail closed for NetBSD. If /etc/pam.d and /etc/pam.conf are missing, then
...
return PAM_SYSTEM_ERR. This is done by checking that chains have at least
one member.
2005-01-12 01:38:23 +00:00
c6f2cec0b0
include <isc/net.h> so that -UWANT_IPV6 compiles correctly.
2005-01-10 02:14:46 +00:00
a546e7bfc2
Fix compilation with -UUSE_INET6
2005-01-10 02:08:51 +00:00
edd9734813
Fix debugging compilation.
2005-01-08 07:58:02 +00:00
4ce4e7d229
Fixed ifdef logic
2005-01-04 12:36:02 +00:00
a6336417c1
openpam_dynamic(): If the pathname provided is not an absolute pathname,
...
prepend PAM_SOPREFIX to the name before dlopen()'ing it. On NetBSD, define
PAM_SOPREFIX as "/usr/lib/security/".
2005-01-03 17:21:48 +00:00
36dcc3119d
more size_t casts
2004-12-30 16:22:45 +00:00
92ee66b8a1
Note also src/regress/sys/kern/ipf
2004-12-30 13:12:01 +00:00
32b2d1458b
undo this last change, it did match fil.c - bad me.
2004-12-30 12:07:07 +00:00
34a5ffc74e
Use src/sys/dist/ipf/netinet instead of src/sys/netinet
2004-12-30 10:09:32 +00:00
760d20de7a
the bitmask array in this file should be the same as the one in fil.c if
...
rules with v6hdr options are going to match packets. this sorts the array
by incrementing value of the v6 option.
2004-12-30 08:29:09 +00:00
28b908ca06
add size_t casts to silence up lint where size_t is unsigned long.
2004-12-30 02:25:51 +00:00
bc7b47989b
a bug fix from OPENBSD_3_6.
...
> revision 1.2.2.1
> date: 2004/12/17 02:51:35; author: brad; state: Exp; lines: +2 -2
> MFC:
> Fix by frantzen@
>
> &&/|| inversion would try to merge IP addresses with non-addresses into a
> single table causing a ruleset load error and eventually a double-free.
>
> ok deraadt@ mcbride@ henning@ frantzen@ dhartmei@
2004-12-19 10:27:46 +00:00
f314fbb0f1
Expand out an unused byte to give each NAT rule a protocol version field,
...
allowing rules to be set to match only ipv4/ipv6. And so ipnat must be updated
to actually set this field correctly but to keep things working for old
versions of ipnat (that will set this to 0), make the ioctl handler "update"
the 0 to a 4 to keep things working when people just upgrade kernels. This
forces NAT rule matching to be limited to ipv4 only, here forward, fixing
kern/28662
2004-12-16 17:01:02 +00:00
db6316d151
fix a merge botch. pointed by Pavel Cahyna.
2004-12-16 02:08:29 +00:00
47d5603068
don't build magic and doc in toolbuild => makes build work again
2004-12-14 16:56:56 +00:00
0127e87a6e
regen with AM_MAINTAINER_MODE enabled to get rid of autoconfusion
...
rebuild mania
2004-12-14 16:08:01 +00:00
0e5822b090
seems like AM_MAINTAINER_MODE was disabled for this release;
...
re-enable it to avoid ./configure rebuild hell
2004-12-14 15:56:10 +00:00
8d312437e8
wage holy war on autoconf to attempt to make the toolbuild work
...
After receiving the magic 10-line incantation from Christos for
re-building the autoconf stuff, attempt to do so. This might fix
the problem, or might not. That is why this stuff is so fun.
2004-12-13 23:57:44 +00:00
f5200852b4
python has wriggled itself in here, yank it out to make the toolbuild work.
2004-12-13 10:43:39 +00:00
ebbb05cb75
munge conflicts
2004-12-13 10:35:03 +00:00
16e0e52b61
file 4.12
...
+ assorted bug fixes
+ switch to 2-clause license
2004-12-13 10:24:25 +00:00
c7df97ab82
Another linted comment about empty macro decl.
2004-12-12 19:44:46 +00:00
980de1e92d
s/__function__/__func__/
2004-12-12 08:29:56 +00:00
80184d2e85
Add a linted comment for an unused variable
2004-12-12 08:16:41 +00:00
a97ddb0609
s/__FUNCTION__/__function__/
2004-12-12 08:06:42 +00:00
a2078b09d1
- link set NetBSD changes from thorpej
...
- lint silencing comments
2004-12-12 06:19:35 +00:00
78a16257c7
Lint silencing comments
2004-12-12 06:18:52 +00:00
3c33f5d161
- unsigned char casts for ctype macros.
...
- lint silencing comments.
2004-12-12 06:18:17 +00:00
d316c2d956
Don't look in /usr/local for pam configuration files. NetBSD does not
...
have them. XXX: maybe look in /usr/pkgsrc?
Unsigned char casts for ctype macros.
2004-12-12 06:17:31 +00:00
e9803b264c
prevent double-free by setting variable to NULL after it has been freed.
...
Avoids problem when shared library is not found during configuration.
2004-12-12 06:15:58 +00:00
fe57a1b812
NetBSD specific link set changes.
2004-12-12 06:14:58 +00:00
3c39f8e35c
- add LINTED comments.
...
- prevent alarm of negative numbers.
- size_t lint casts
- avoid shadowing of variables.
2004-12-12 06:14:06 +00:00
dead717d6a
size_t cast for lint
2004-12-12 06:12:26 +00:00
b73b054f62
import openpam "eelgrass" released on 20040210
2004-12-12 06:07:19 +00:00
d1f40c5512
Make bpf use the cloning device
2004-12-01 23:51:36 +00:00
f63af1b624
Use the cloning device if that is available
2004-12-01 23:49:27 +00:00
9ab78e153b
use /dev/bpf
2004-12-01 23:45:12 +00:00
e9e8578a0e
fix configure too.
2004-12-01 23:26:13 +00:00
4d31f227c2
only mention /dev/bpf
2004-12-01 23:24:38 +00:00
aad48c44a7
One bpf is enough.
2004-12-01 23:23:39 +00:00
be07a6cfdb
One bpf is enough
2004-12-01 23:22:42 +00:00
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
b81f308085
Fix typo in formatting.
2004-11-27 23:23:26 +00:00
ccc24aa67e
fix merge botches.
2004-11-27 01:39:50 +00:00
763bdaa346
Resolve conflicts.
2004-11-27 01:24:35 +00:00
f8d5cae651
from 20040916 from ftp.am-utils.org
2004-11-27 01:00:29 +00:00
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
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
c1c81c7612
Sort options in usage, add missing "]" (OpenBSD v1.38).
2004-11-19 20:52:10 +00:00
d0b9170efe
Sort option descriptions (OpenBSD v1.42).
2004-11-19 20:51:34 +00:00
057eb0b30f
don't use variable arg macro, which is not supported by gcc2.
2004-11-16 05:14:12 +00:00
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
533d14a1b9
import pf from OpenBSD 3.6. (userland part)
2004-11-14 11:08:58 +00:00
2befd828c2
Remove declaration of unused "cksum" variable.
2004-11-13 22:28:49 +00:00
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
peter