Changeset 1941

Timestamp:

02/19/08 08:34:10 (9 months ago)

Author:

dsugar

Message:

add missing optional block

Files:

• branches/dictionary_changes/src/com/tresys/framework/compiler/translator/TranslatorSELinux.java (modified) (6 diffs)

branches/dictionary_changes/src/com/tresys/framework/compiler/translator/TranslatorSELinux.java

@@ -299 +299 @@
-                        m_bufferPolicy.println("\t')");
-                }
-
+
-                for (Iterator itr = i_enter.GetEntryAccessDefns().iterator(); itr.hasNext(); ) 
-                {
@@ -326 +326 @@
-                        }
-                }
-
+
-                if (i_enter.getStartDomain() instanceof BaseDomain)
-                {
-                        m_bufferPolicy.println("\n')");
-                }
-
+
-                if(isBoolean)
-                {
@@ -435 +435 @@
-                m_bufferPolicy.println("# CDSFramework access (domain resource verb): " + i_access.toString().replace(Utility.DELIM, ' '));
-
+                IDomain domain = i_access.getDomain ();
+                if (domain instanceof BaseDomain)
+                {
+                        m_bufferPolicy.println ("optional_policy(`"); 
+                        m_bufferPolicy.println ("\tgen_require(`"); 
+                        m_bufferPolicy.println ("\t\ttype " + domain.getType() + ";"); 
+                        m_bufferPolicy.println ("\t\trole " + ((BaseDomain) domain).GetRole() + ";"); 
+                        m_bufferPolicy.println ("\t')");
+                }
+
-                // for each AccessTarget associated with this AccessDefn
-                Collection accessDefns = i_access.GetAccessDefns();
@@ -446 +456 @@
-                        m_bufferPolicy.print(templateName + "(" + i_access.getDomain().getType() + ",");
-                        
-
+ 
-                        {
-                                m_bufferPolicy.println (((ControlResource)i_access.getResource()).getType() + ")");
@@ -531 +541 @@
-                                        m_bufferPolicy.println("\t\ttype " + sTarget + ";");
-                                        m_bufferPolicy.println("\t')");
+
-                                        m_bufferPolicy.println("\tfiletrans_pattern(" + sProcessType + ", " + sTarget 
-                                                + ", " + sResType + ", " + sObjClass + ");");
+                                        
-                                        m_bufferPolicy.println("')");
-                                }
-                        }
-                }
-
-
+
+
+
+
+
-                {
-                        m_bufferPolicy.println ("}");
@@ -546 +561 @@
-        public void Visit (BaseDomain domain)
-        {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        }
-