Changeset 224

Show
Ignore:
Timestamp:
07/31/08 13:31:51 (4 months ago)
Author:
jmowery
Message:

additional fix to get wrapped netif controls working

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branch/RHEL-5.2-20080702merge/src/selinux-policy-clip/Makefile

    r167 r224  
    388388        @echo "#" >> $@ 
    389389        $(verbose) cat $@.in >> $@ 
    390         $(verbose) $(GREP) "^[[:blank:]]*network_(interface|node|port|packet)\(.*\)" $< \ 
     390        $(verbose) $(GREP) "^[[:blank:]]*network_(interface|node|port|packet|interface_controlled)\(.*\)" $< \ 
    391391                | $(M4) -D self_contained_policy $(M4PARAM) $@.m4 - \ 
    392392                | $(SED) -e 's/dollarsone/\$$1/g' -e 's/dollarszero/\$$0/g' >> $@ 

  • branch/RHEL-5.2-20080702merge/src/selinux-policy-clip/policy/modules/kernel/corenetwork.if.m4

    r221 r224  
    285285        corenet_raw_receive_$1_if(dollarsone) 
    286286') 
    287 '') dnl end create_netif_interfaces 
     287'') dnl end create_netif_interfaces_controlled 
    288288 
    289289######################################## 
    …… 
    788788create_netif_interfaces($1,netif_t,type) 
    789789') 
     790define(`create_netif_type_interfaces_controlled',` 
     791create_netif_interfaces_controlled($1,netif_t,type) 
     792') 
    790793define(`create_netif_attrib_interfaces',` 
    791794create_netif_interfaces($1,netif,attribute) 
    792795') 
     796define(`create_netif_attrib_interfaces_controlled',` 
     797create_netif_interfaces_controlled($1,netif,attribute) 
     798') 
    793799 
    794800# 
    …… 
    797803define(`network_interface',` 
    798804create_netif_type_interfaces($1) 
     805') 
     806 
     807define(`network_interface_controlled',` 
     808create_netif_type_interfaces_controlled($1) 
    799809') 
    800810