trunk: Add unused interface/template parameter metadata in XML.

diff --git a/Changelog b/Changelog
index 1c51524ae957349ef3d68df176426b8490d51669..8289f4a611569fe84b8328ee368575e9ee7a170e 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,4 @@
+- Add unused interface/template parameter metadata in XML.
 - Patch to handle postfix data_directory from Vaclav Ovsik.
 - SE-Postgresql policy from KaiGai Kohei.
 - Patch for X.org dbus support from Martin Orr.

diff --git a/doc/policy.dtd b/doc/policy.dtd
index e6a41820bfb4bd393e20e8d86456e50ef8931e83..b797f712097a4235a5b4e3ddc0b45e1077734796 100644 (file)
--- a/doc/policy.dtd
+++ b/doc/policy.dtd
@@ -28,7 +28,8 @@
 <!ELEMENT param (summary)>
 <!ATTLIST param 
       name CDATA #REQUIRED
-      optional (true|false) "false">
+      optional (true|false) "false"
+      unused (true|false) "false">
 <!ELEMENT infoflow EMPTY>
 <!ATTLIST infoflow 
       type CDATA #REQUIRED

diff --git a/doc/templates/interface.html b/doc/templates/interface.html
index ae7bf49ef69e304d8042c5e20f9f42d24247c509..90eb4369f17e3ee344c3c38e7f7bee97ffffeeb2 100644 (file)
--- a/doc/templates/interface.html
+++ b/doc/templates/interface.html
@@ -35,15 +35,13 @@
 [[int['interface_desc']]]
 [[end]]
 <h5>Parameters</h5>
-<table border="1" cellspacing="0" cellpadding="3" width="80%">
-<tr><th >Parameter:</td><th >Description:</td><th >Optional:</td></tr>
+<table border="1" cellspacing="0" cellpadding="3" width="65%">
+<tr><th >Parameter:</th><th >Description:</th></tr>
 [[for arg in int['interface_parameters']]]
 <tr><td>
 [[arg['name']]]
 </td><td>
 [[arg['desc']]]
-</td><td>
-[[arg['optional']]]
 </td></tr>
 [[end]]
 </table>

diff --git a/doc/templates/template.html b/doc/templates/template.html
index c24a83ef1759ad79afb184183cbd81687ecde722..251d22774cf528122e04346aac9ce7df91681f8b 100644 (file)
--- a/doc/templates/template.html
+++ b/doc/templates/template.html
@@ -35,15 +35,13 @@
 [[temp['template_desc']]]
 [[end]]
 <h5>Parameters</h5>
-<table border="1" cellspacing="0" cellpadding="3" width="80%">
-<tr><th >Parameter:</td><th >Description:</td><th >Optional:</td></tr>
+<table border="1" cellspacing="0" cellpadding="3" width="65%">
+<tr><th >Parameter:</th><th >Description:</th></tr>
 [[for arg in temp['template_parameters']]]
 <tr><td>
 [[arg['name']]]
 </td><td>
 [[arg['desc']]]
-</td><td>
-[[arg['optional']]]
 </td></tr>
 [[end]]
 </table>

diff --git a/policy/modules/services/cpucontrol.if b/policy/modules/services/cpucontrol.if
index a8275924d5ddf7bcae6255d9143500a24ba35af7..d7b79e727471b8edeef8a223d3d4fb55f825f236 100644 (file)
--- a/policy/modules/services/cpucontrol.if
+++ b/policy/modules/services/cpucontrol.if
@@ -4,7 +4,7 @@
 ## <summary>
 ##     CPUcontrol stub interface.  No access allowed.
 ## </summary>
-## <param name="domain" optional="true">
+## <param name="domain" optional="true" unused="true">
 ##     <summary>
 ##     N/A
 ##     </summary>

diff --git a/policy/modules/services/dbus.if b/policy/modules/services/dbus.if
index 1485fddb212f2e23a88cc6875f759cc437778140..f0d18478a111a7ee3d7ff4be3e86de7913a8d4ca 100644 (file)
--- a/policy/modules/services/dbus.if
+++ b/policy/modules/services/dbus.if
@@ -4,7 +4,7 @@
 ## <summary>
 ##     DBUS stub interface.  No access allowed.
 ## </summary>
-## <param name="domain" optional="true">
+## <param name="domain" optional="true" unused="true">
 ##     <summary>
 ##     N/A
 ##     </summary>
@@ -236,7 +236,7 @@ template(`dbus_system_bus_client_template',`
 ##     is the prefix for user_t).
 ##     </summary>
 ## </param>
-## <param name="domain_prefix">
+## <param name="domain_prefix" unused="true">
 ##     <summary>
 ##     The prefix of the domain (e.g., user
 ##     is the prefix for user_t).

diff --git a/policy/modules/services/mta.if b/policy/modules/services/mta.if
index 9488fb0f1c52901200d6e459fe8fd9e51df62520..b20fb953ab12b2204664934aeae275f27096166b 100644 (file)
--- a/policy/modules/services/mta.if
+++ b/policy/modules/services/mta.if
@@ -4,7 +4,7 @@
 ## <summary>
 ##     MTA stub interface.  No access allowed.
 ## </summary>
-## <param name="domain" optional="true">
+## <param name="domain" optional="true" unused="true">
 ##     <summary>
 ##     N/A
 ##     </summary>

diff --git a/policy/modules/services/ntp.if b/policy/modules/services/ntp.if
index ab5a15f1157364872d5e5b11475721da53fbf86d..633043955e3be78da2f5e3abd0578050b4ab9b71 100644 (file)
--- a/policy/modules/services/ntp.if
+++ b/policy/modules/services/ntp.if
@@ -4,7 +4,7 @@
 ## <summary>
 ##     NTP stub interface.  No access allowed.
 ## </summary>
-## <param name="domain" optional="true">
+## <param name="domain" optional="true" unused="true">
 ##     <summary>
 ##     N/A
 ##     </summary>

diff --git a/policy/modules/services/postfix.if b/policy/modules/services/postfix.if
index 5cf7186cb4dacd22abbcd95b808aeb7b4695fb3b..8ec787cc851f268ef52138d245c80407d66c628c 100644 (file)
--- a/policy/modules/services/postfix.if
+++ b/policy/modules/services/postfix.if
@@ -165,7 +165,7 @@ template(`postfix_user_domain_template',`
 ## <summary>
 ##     The per role template for the postfix module.
 ## </summary>
-## <param name="prefix">
+## <param name="prefix" unused="true">
 ##     <summary>
 ##     The prefix of the user domain.
 ##     (e.g., user is the prefix of user_t)
@@ -176,6 +176,11 @@ template(`postfix_user_domain_template',`
 ##     User domain type.
 ##     </summary>
 ## </param>
+## <param name="user_role">
+##     <summary>
+##     User role
+##     </summary>
+## </param>
 #
 template(`postfix_per_role_template',`
        gen_require(`

diff --git a/policy/modules/services/qmail.if b/policy/modules/services/qmail.if
index 4c90a54442cde26928b5ddfb2ccd5b8f9b30f8df..e14d35e20c34c125997f089aa7296d26354e9a35 100644 (file)
--- a/policy/modules/services/qmail.if
+++ b/policy/modules/services/qmail.if
@@ -11,7 +11,7 @@
 ##      by policy writers.
 ##      </p>
 ## </desc>
-## <param name="userdomain_prefix">
+## <param name="userdomain_prefix" unused="true">
 ##      <summary>
 ##      The prefix of the user domain (e.g., user
 ##      is the prefix for user_t).

diff --git a/policy/modules/services/rhgb.if b/policy/modules/services/rhgb.if
index c859f23d80245b39490f97488fa89a8e6fdeabd7..c9711c6c68e3960db3bd91d7b4381df40d2d7b95 100644 (file)
--- a/policy/modules/services/rhgb.if
+++ b/policy/modules/services/rhgb.if
@@ -4,7 +4,7 @@
 ## <summary>
 ##     RHGB stub interface.  No access allowed.
 ## </summary>
-## <param name="domain">
+## <param name="domain" unused="true">
 ##     <summary>
 ##     N/A
 ##     </summary>

diff --git a/policy/modules/services/rpc.if b/policy/modules/services/rpc.if
index afc5e81f232c3514d79fd00030bf1ea78f9ebe85..294f0adf58b008458485c99fe844c5df87c1986c 100644 (file)
--- a/policy/modules/services/rpc.if
+++ b/policy/modules/services/rpc.if
@@ -4,7 +4,7 @@
 ## <summary>
 ##     RPC stub interface.  No access allowed.
 ## </summary>
-## <param name="domain" optional="true">
+## <param name="domain" optional="true" unused="true">
 ##     <summary>
 ##     N/A
 ##     </summary>

diff --git a/policy/modules/services/sendmail.if b/policy/modules/services/sendmail.if
index 4e176debede557f89bf0a7af5b58c32f6fad1c16..3e7077fba882af33b9016fd61ffe318b9a0bea10 100644 (file)
--- a/policy/modules/services/sendmail.if
+++ b/policy/modules/services/sendmail.if
@@ -4,7 +4,7 @@
 ## <summary>
 ##     Sendmail stub interface.  No access allowed.
 ## </summary>
-## <param name="domain" optional="true">
+## <param name="domain" optional="true" unused="true">
 ##     <summary>
 ##     N/A
 ##     </summary>

diff --git a/policy/modules/system/pcmcia.if b/policy/modules/system/pcmcia.if
index 4932c0b91fa682febe9977011d4ddaf2270466bf..b819b959863fe95a6349c161b4c304d219bc4050 100644 (file)
--- a/policy/modules/system/pcmcia.if
+++ b/policy/modules/system/pcmcia.if
@@ -4,7 +4,7 @@
 ## <summary>
 ##     PCMCIA stub interface.  No access allowed.
 ## </summary>
-## <param name="domain" optional="true">
+## <param name="domain" optional="true" unused="true">
 ##     <summary>
 ##     N/A
 ##     </summary>

diff --git a/support/sedoctool.py b/support/sedoctool.py
index f15a5b5043c7f44f5bede1d326cc837db9cd7419..5bbaf76375fce9e6e0c03957df606f446e432379 100644 (file)
--- a/support/sedoctool.py
+++ b/support/sedoctool.py
@@ -465,9 +465,14 @@ def gen_docs(doc, working_dir, templatedir):
                                        paramopt = "Yes"
                                else:
                                        paramopt = "No"
+                               if args.getAttribute("unused") == "true":
+                                       paramunused = "Yes"
+                               else:
+                                       paramunused = "No"
                                parameter = { "name" : paramname,
                                              "desc" : paramdesc,
-                                             "optional" : paramopt }
+                                             "optional" : paramopt,
+                                             "unused" : paramunused }
                                interface_parameters.append(parameter)
                        interfaces.append( { "interface_name" : interface_name,
                                           "interface_summary" : interface_summary,
@@ -506,9 +511,14 @@ def gen_docs(doc, working_dir, templatedir):
                                        paramopt = "Yes"
                                else:
                                        paramopt = "No"
+                               if args.getAttribute("unused") == "true":
+                                       paramunused = "Yes"
+                               else:
+                                       paramunused = "No"
                                parameter = { "name" : paramname,
                                              "desc" : paramdesc,
-                                             "optional" : paramopt }
+                                             "optional" : paramopt,
+                                             "unused": paramunused }
                                template_parameters.append(parameter)
                        templates.append( { "template_name" : template_name,
                                           "template_summary" : template_summary,