CVSROOT:        /cvs
Module name:    src
Changes by:     henn...@cvs.openbsd.org 2010/06/25 17:27:47

Modified files:
        sbin/pfctl     : pfctl.8 pfctl.c pfctl_parser.h 

Log message:
remove -m (merge).
it is violating the transactional model we have and made stronger in
pf, it is broken in some cases and since some options are passed to the
kernel while some are userland only and affect how the rules are
parsed it is complete bullshit anyway - obviously, changing options
that affect ruleset parsing without reloading and thus reparsing the
ruleset cannot work. so stop pretending it could and cut the crap.
ok dlg krw deraadt

Reply via email to