cvs commit: src/contrib/pf/authpf authpf.c src/contrib/pf/ftp-proxy ftp-proxy.8 ftp-proxy.c src/contrib/pf/man pf.4 pf.conf.5 pflog.4 pfsync.4 src/contrib/pf/pfctl parse.y pf_print_state.c pfctl.c pfctl.h pfctl_altq.c pfctl_optimize.c pfctl_parser.c ...

[Max Laier]

mlaier      2005-05-03 16:55:20 UTC

  FreeBSD src repository

  Modified files:
    contrib/pf/authpf    authpf.c 
    contrib/pf/ftp-proxy ftp-proxy.8 ftp-proxy.c 
    contrib/pf/man       pf.4 pf.conf.5 pflog.4 pfsync.4 
    contrib/pf/pfctl     parse.y pf_print_state.c pfctl.c pfctl.h 
                         pfctl_altq.c pfctl_optimize.c 
                         pfctl_parser.c pfctl_parser.h 
                         pfctl_qstats.c pfctl_table.c 
    contrib/pf/pflogd    pflogd.c pidfile.c privsep.c 
  Log:
  Resolve conflicts created during the import of pf 3.7 Some features are
  missing and will be implemented in a second step.  This is functional as is.
  
  Tested by:      freebsd-pf, pfsense.org
  Obtained from:  OpenBSD
  
  Revision  Changes    Path
  1.6       +177 -262  src/contrib/pf/authpf/authpf.c
  1.4       +20 -1     src/contrib/pf/ftp-proxy/ftp-proxy.8
  1.6       +62 -18    src/contrib/pf/ftp-proxy/ftp-proxy.c
  1.7       +627 -351  src/contrib/pf/man/pf.4
  1.8       +287 -83   src/contrib/pf/man/pf.conf.5
  1.4       +0 -0      src/contrib/pf/man/pflog.4
  1.5       +33 -16    src/contrib/pf/man/pfsync.4
  1.7       +457 -187  src/contrib/pf/pfctl/parse.y
  1.3       +4 -1      src/contrib/pf/pfctl/pf_print_state.c
  1.6       +413 -313  src/contrib/pf/pfctl/pfctl.c
  1.6       +9 -8      src/contrib/pf/pfctl/pfctl.h
  1.7       +46 -17    src/contrib/pf/pfctl/pfctl_altq.c
  1.2       +7 -0      src/contrib/pf/pfctl/pfctl_optimize.c
  1.7       +120 -93   src/contrib/pf/pfctl/pfctl_parser.c
  1.6       +54 -7     src/contrib/pf/pfctl/pfctl_parser.h
  1.6       +5 -3      src/contrib/pf/pfctl/pfctl_qstats.c
  1.7       +14 -22    src/contrib/pf/pfctl/pfctl_table.c
  1.8       +30 -7     src/contrib/pf/pflogd/pflogd.c
  1.4       +0 -0      src/contrib/pf/pflogd/pidfile.c
  1.3       +11 -7     src/contrib/pf/pflogd/privsep.c