diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-05-02 11:41:50 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-05-02 11:41:50 +0000 |
| commit | 7aee23a10c59bb8b0a3f41e8b38fa2d7072ae8fa (patch) | |
| tree | d8bfb80066f431c42ee8176bf4ad5775005b7cbb /usr/src/cmd/ipf | |
| parent | d006a4cbd4e9a251a94eec493f1618a9e452992a (diff) | |
| parent | 545f15ae81ab124ab97b965c15f2873e0228fcb3 (diff) | |
| download | illumos-joyent-7aee23a10c59bb8b0a3f41e8b38fa2d7072ae8fa.tar.gz | |
[illumos-gate merge]
commit 545f15ae81ab124ab97b965c15f2873e0228fcb3
6883 SMF nis/client ipfilter support needs improvement
commit 2bd8b3545dceb97f56401b7ad2a327e08d520574
6881 SMF ipfilter tries to unload module in zones
6882 SMF ipfilter lacks a property for a IPv6 custom policy file
6884 SMF ipfilter tuple_get_port needs to remove backslashes
commit d14b1d19b404dcc4795d8a76751a186717a0ddaa
6934 add kstat to track anon memory reservation failure (ENOMEM)
commit c22cda1b41022b307ea9fda8c9dc19e6329a109a
6847 syscall header declaration incorrect
Conflicts:
usr/src/uts/common/vm/vm_anon.c
usr/src/uts/common/sys/zone.h
usr/src/uts/common/os/zone.c
Diffstat (limited to 'usr/src/cmd/ipf')
| -rw-r--r-- | usr/src/cmd/ipf/svc/ipfilter | 2 | ||||
| -rw-r--r-- | usr/src/cmd/ipf/svc/ipfilter.xml | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/usr/src/cmd/ipf/svc/ipfilter b/usr/src/cmd/ipf/svc/ipfilter index 2e6f2189f6..48e3e2e915 100644 --- a/usr/src/cmd/ipf/svc/ipfilter +++ b/usr/src/cmd/ipf/svc/ipfilter @@ -214,7 +214,7 @@ case "$1" in fi ipf -D - [ -n "$ipfid" ] && modunload -i $ipfid + [ "$zone" = "global" -a -n "$ipfid" ] && modunload -i $ipfid ;; pause) diff --git a/usr/src/cmd/ipf/svc/ipfilter.xml b/usr/src/cmd/ipf/svc/ipfilter.xml index e4a70405c1..5f088f5344 100644 --- a/usr/src/cmd/ipf/svc/ipfilter.xml +++ b/usr/src/cmd/ipf/svc/ipfilter.xml @@ -106,7 +106,10 @@ <propval name='policy' type='astring' value='none' /> <propval name='block_policy' type='astring' value='none' /> - <propval name='custom_policy_file' type='astring' value='' /> + <propval name='custom_policy_file' type='astring' + value='/etc/ipf/ipf.conf' /> + <propval name='custom_policy_file_6' type='astring' + value='/etc/ipf/ipf6.conf' /> <propval name='apply_to' type='astring' value='' /> <propval name='apply_to_6' type='astring' value='' /> <propval name='exceptions' type='astring' value='' /> |