CVS commit: src/dist/pf

[Peter Postma <peter%netbsd.org@localhost>]

Module Name:    src
Committed By:   peter
Date:           Fri Jul  1 12:43:50 UTC 2005

Modified Files:
        src/dist/pf/libexec/ftp-proxy: ftp-proxy.8 ftp-proxy.c getline.c util.h
        src/dist/pf/sbin/pfctl: parse.y pf_print_state.c pfctl.8 pfctl.c
            pfctl.h pfctl_altq.c pfctl_optimize.c pfctl_osfp.c pfctl_parser.c
            pfctl_parser.h pfctl_table.c
        src/dist/pf/sbin/pflogd: pflogd.8 pflogd.c pflogd.h privsep.c
            privsep_fdpass.c
        src/dist/pf/share/man/man4: pf.4 pflog.4
        src/dist/pf/share/man/man5: pf.conf.5 pf.os.5
        src/dist/pf/usr.sbin/authpf: authpf.8 authpf.c

Log Message:
Resolve conflicts (pf from OpenBSD 3.7, userland part).


To generate a diff of this commit:
cvs rdiff -r1.6 -r1.7 src/dist/pf/libexec/ftp-proxy/ftp-proxy.8
cvs rdiff -r1.10 -r1.11 src/dist/pf/libexec/ftp-proxy/ftp-proxy.c
cvs rdiff -r1.2 -r1.3 src/dist/pf/libexec/ftp-proxy/getline.c
cvs rdiff -r1.4 -r1.5 src/dist/pf/libexec/ftp-proxy/util.h
cvs rdiff -r1.5 -r1.6 src/dist/pf/sbin/pfctl/parse.y \
    src/dist/pf/sbin/pfctl/pfctl_table.c
cvs rdiff -r1.2 -r1.3 src/dist/pf/sbin/pfctl/pf_print_state.c
cvs rdiff -r1.4 -r1.5 src/dist/pf/sbin/pfctl/pfctl.8 \
    src/dist/pf/sbin/pfctl/pfctl_altq.c \
    src/dist/pf/sbin/pfctl/pfctl_optimize.c \
    src/dist/pf/sbin/pfctl/pfctl_osfp.c
cvs rdiff -r1.3 -r1.4 src/dist/pf/sbin/pfctl/pfctl.c \
    src/dist/pf/sbin/pfctl/pfctl.h src/dist/pf/sbin/pfctl/pfctl_parser.h
cvs rdiff -r1.6 -r1.7 src/dist/pf/sbin/pfctl/pfctl_parser.c
cvs rdiff -r1.2 -r1.3 src/dist/pf/sbin/pflogd/pflogd.8 \
    src/dist/pf/sbin/pflogd/pflogd.c src/dist/pf/sbin/pflogd/pflogd.h \
    src/dist/pf/sbin/pflogd/privsep.c
cvs rdiff -r1.1.1.2 -r1.2 src/dist/pf/sbin/pflogd/privsep_fdpass.c
cvs rdiff -r1.2 -r1.3 src/dist/pf/share/man/man4/pf.4 \
    src/dist/pf/share/man/man4/pflog.4
cvs rdiff -r1.3 -r1.4 src/dist/pf/share/man/man5/pf.conf.5
cvs rdiff -r1.2 -r1.3 src/dist/pf/share/man/man5/pf.os.5
cvs rdiff -r1.5 -r1.6 src/dist/pf/usr.sbin/authpf/authpf.8
cvs rdiff -r1.3 -r1.4 src/dist/pf/usr.sbin/authpf/authpf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.