rpms/selinux-policy
7
0
Fork 0
Code Issues Pull Requests Releases Activity

remove secdesc since desc is sufficient

Browse Source
This commit is contained in:
Chris PeBenito 2005-08-11 17:55:47 +00:00
parent f7ebea06e3
commit d06f3c3752
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
refpolicy/doc/policy.dtd
View File

@ -19,12 +19,11 @@
name CDATA #REQUIRED name CDATA #REQUIRED
dftval CDATA #REQUIRED> dftval CDATA #REQUIRED>
<!ELEMENT summary (#PCDATA)> <!ELEMENT summary (#PCDATA)>
<!ELEMENT interface (summary,desc?,secdesc?,param+,infoflow?)> <!ELEMENT interface (summary,desc?,param+,infoflow?)>
<!ATTLIST interface name CDATA #REQUIRED> <!ATTLIST interface name CDATA #REQUIRED>
<!ELEMENT template (summary,desc?,secdesc?,param+)> <!ELEMENT template (summary,desc?,param+)>
<!ATTLIST template name CDATA #REQUIRED> <!ATTLIST template name CDATA #REQUIRED>
<!ELEMENT desc (#PCDATA|%inline.class;)*> <!ELEMENT desc (#PCDATA|%inline.class;)*>
<!ELEMENT secdesc (#PCDATA|%inline.class;)*>
<!ELEMENT param (#PCDATA)> <!ELEMENT param (#PCDATA)>
<!ATTLIST param <!ATTLIST param
name CDATA #REQUIRED name CDATA #REQUIRED

18
refpolicy/support/sedoctool.py
View File

@ -389,14 +389,11 @@ def gen_docs(doc, working_dir, templatedir):
interfaces = [] interfaces = []
for interface in node.getElementsByTagName("interface"): for interface in node.getElementsByTagName("interface"):
interface_parameters = [] interface_parameters = []
interface_desc = interface_secdesc = interface_summary = None interface_desc = interface_summary = None
for i,v in interface.attributes.items(): for i,v in interface.attributes.items():
interface_name = v interface_name = v
for desc in interface.getElementsByTagName("desc"): for desc in interface.getElementsByTagName("desc"):
interface_desc = format_html_desc(desc) interface_desc = format_html_desc(desc)
for desc in interface.getElementsByTagName("secdesc"):
if desc:
interface_secdesc = format_html_desc(desc)
for desc in interface.getElementsByTagName("summary"): for desc in interface.getElementsByTagName("summary"):
interface_summary = format_html_desc(desc) interface_summary = format_html_desc(desc)
@ -417,14 +414,12 @@ def gen_docs(doc, working_dir, templatedir):
interfaces.append( { "interface_name" : interface_name, interfaces.append( { "interface_name" : interface_name,
"interface_summary" : interface_summary, "interface_summary" : interface_summary,
"interface_desc" : interface_desc, "interface_desc" : interface_desc,
"interface_parameters" : interface_parameters, "interface_parameters" : interface_parameters })
"interface_secdesc" : interface_secdesc })
#all_interfaces is for the main interface index with all interfaces #all_interfaces is for the main interface index with all interfaces
all_interfaces.append( { "interface_name" : interface_name, all_interfaces.append( { "interface_name" : interface_name,
"interface_summary" : interface_summary, "interface_summary" : interface_summary,
"interface_desc" : interface_desc, "interface_desc" : interface_desc,
"interface_parameters" : interface_parameters, "interface_parameters" : interface_parameters,
"interface_secdesc" : interface_secdesc,
"mod_name": mod_name, "mod_name": mod_name,
"mod_layer" : mod_layer }) "mod_layer" : mod_layer })
interfaces.sort(int_cmp) interfaces.sort(int_cmp)
@ -436,14 +431,11 @@ def gen_docs(doc, working_dir, templatedir):
templates = [] templates = []
for template in node.getElementsByTagName("template"): for template in node.getElementsByTagName("template"):
template_parameters = [] template_parameters = []
template_desc = template_secdesc = template_summary = None template_desc = template_summary = None
for i,v in template.attributes.items(): for i,v in template.attributes.items():
template_name = v template_name = v
for desc in template.getElementsByTagName("desc"): for desc in template.getElementsByTagName("desc"):
template_desc = format_html_desc(desc) template_desc = format_html_desc(desc)
for desc in template.getElementsByTagName("secdesc"):
if desc:
template_secdesc = format_html_desc(desc)
for desc in template.getElementsByTagName("summary"): for desc in template.getElementsByTagName("summary"):
template_summary = format_html_desc(desc) template_summary = format_html_desc(desc)
@ -464,14 +456,12 @@ def gen_docs(doc, working_dir, templatedir):
templates.append( { "template_name" : template_name, templates.append( { "template_name" : template_name,
"template_summary" : template_summary, "template_summary" : template_summary,
"template_desc" : template_desc, "template_desc" : template_desc,
"template_parameters" : template_parameters, "template_parameters" : template_parameters })
"template_secdesc" : template_secdesc })
#all_templates is for the main interface index with all templates #all_templates is for the main interface index with all templates
all_templates.append( { "template_name" : template_name, all_templates.append( { "template_name" : template_name,
"template_summary" : template_summary, "template_summary" : template_summary,
"template_desc" : template_desc, "template_desc" : template_desc,
"template_parameters" : template_parameters, "template_parameters" : template_parameters,
"template_secdesc" : template_secdesc,
"mod_name": mod_name, "mod_name": mod_name,
"mod_layer" : mod_layer }) "mod_layer" : mod_layer })