[selinux-policy: 206/3172] instead of using macros to drop out non-macro calls during corenetwork interface generation, use gre

[Daniel J Walsh]

commit 6276f10155ba8eaaf9c9c5867b75511b33e1a420
Author: Chris PeBenito <cpebenito at tresys.com>
Date:   Tue May 24 15:52:57 2005 +0000

    instead of using macros to drop out non-macro calls during corenetwork
    interface generation, use grep to get the macro calls and feed to m4

 refpolicy/Makefile                             |    3 ++-
 refpolicy/policy/modules/kernel/corenetwork.if |    9 ---------
 2 files changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/refpolicy/Makefile b/refpolicy/Makefile
index 580ca62..1615abc 100644
--- a/refpolicy/Makefile
+++ b/refpolicy/Makefile
@@ -158,7 +158,8 @@ tmp/generated_definitions.conf: $(ALL_MODULES) $(ALL_TE_FILES) $(BASE_MODULE)/co
 	$(QUIET) for i in $(notdir $(ALL_TE_FILES)); do \
 		echo "define(\`$$i')" >> $@ ;\
 	done
-	$(QUIET) m4 $(M4PARAM) -D interface_pass $(BASE_MODULE)/global.if $(BASE_MODULE)/corenetwork.if $(BASE_MODULE)/corenetwork.te \
+	$(QUIET) grep -E "^network_(interface|node|port)\(.*\)" $(BASE_MODULE)/corenetwork.te \
+		| m4 $(M4PARAM) -D interface_pass $(BASE_MODULE)/global.if $(BASE_MODULE)/corenetwork.if - \
 		| sed -e 's/dollarsone/\$$1/g' -e 's/dollarszero/\$$0/g' >> $@
 
 tmp/all_interfaces.conf: $(ALL_INTERFACES)
diff --git a/refpolicy/policy/modules/kernel/corenetwork.if b/refpolicy/policy/modules/kernel/corenetwork.if
index d772391..68ea75d 100644
--- a/refpolicy/policy/modules/kernel/corenetwork.if
+++ b/refpolicy/policy/modules/kernel/corenetwork.if
@@ -790,15 +790,6 @@ class udp_socket name_bind;
 #
 ########################################
 
-# dont generate anything but macros on this pass
-ifdef(`interface_pass',`
-define(`allow',`dnl')
-define(`type',`dnl')
-define(`attribute',`dnl')
-define(`portcon',`dnl')
-define(`devices_make_device_node',`dnl')
-')
-
 ########################################
 #
 # Network Interface generated macros