Module Name: src
Committed By: riz
Date: Mon Jan 7 16:51:08 UTC 2013
Modified Files:
src/dist/pf/usr.sbin/ftp-proxy [netbsd-6]: npf.c
src/lib/libnpf [netbsd-6]: npf.3 npf.c npf.h
src/sys/net/npf [netbsd-6]: npf.h npf_ctl.c
src/usr.sbin/npf/npfctl [netbsd-6]: npf.conf.5 npf_build.c npfctl.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #776):
usr.sbin/npf/npfctl/npf.conf.5: revision 1.26
usr.sbin/npf/npfctl/npfctl.c: revision 1.26
dist/pf/usr.sbin/ftp-proxy/npf.c: revision 1.2
lib/libnpf/npf.c: revision 1.15
sys/net/npf/npf_ctl.c: revision 1.20
lib/libnpf/npf.h: revision 1.12
lib/libnpf/npf.3: revision 1.6
lib/libnpf/npf.3: revision 1.7
usr.sbin/npf/npfctl/npf_build.c: revision 1.17
sys/net/npf/npf.h: revision 1.24
- Add NPF version check in proplist as well, not only ioctl. Bump the version.
- Fix a bug in table entry lookup.
- Updates/fixes to the man pages. Misc.
Remove a superfluous quote and fix a recurring typo.
ftp-proxy: disable NPF bits for now; it will be re-done.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.8.1 src/dist/pf/usr.sbin/ftp-proxy/npf.c
cvs rdiff -u -r1.4.2.1 -r1.4.2.2 src/lib/libnpf/npf.3
cvs rdiff -u -r1.7.2.7 -r1.7.2.8 src/lib/libnpf/npf.c
cvs rdiff -u -r1.6.2.5 -r1.6.2.6 src/lib/libnpf/npf.h
cvs rdiff -u -r1.14.2.9 -r1.14.2.10 src/sys/net/npf/npf.h
cvs rdiff -u -r1.12.2.6 -r1.12.2.7 src/sys/net/npf/npf_ctl.c
cvs rdiff -u -r1.9.2.6 -r1.9.2.7 src/usr.sbin/npf/npfctl/npf.conf.5
cvs rdiff -u -r1.4.2.9 -r1.4.2.10 src/usr.sbin/npf/npfctl/npf_build.c
cvs rdiff -u -r1.10.2.10 -r1.10.2.11 src/usr.sbin/npf/npfctl/npfctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
