[selinux-policy/f17] Fix segendomainman to pull shorname types as well as domainname types

[Daniel J Walsh]

commit 558e516292b43adfb3cf3addbbb73b563e9b86b7
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Tue Mar 20 11:26:44 2012 -0400

    Fix segendomainman to pull shorname types as well as domainname types

 segendomainman |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/segendomainman b/segendomainman
index 3f0e078..9f10254 100755
--- a/segendomainman
+++ b/segendomainman
@@ -51,17 +51,6 @@ except IOError, e:
 
 entrypoints =  setools.seinfo(setools.ATTRIBUTE,"entry_type")[0]["types"]
 alldomains =  setools.seinfo(setools.ATTRIBUTE,"domain")[0]["types"]
-domains = []
-for d in alldomains:
-    found = False
-    if d[:-2] + "_exec_t" not in entrypoints:
-        continue
-    name = d.split("_")[0]
-    if name in domains or name == "pam":
-        continue
-    domains.append(name)
-
-domains.sort()
 
 file_types =  setools.seinfo(setools.ATTRIBUTE,"file_type")[0]["types"]
 file_types.sort()
@@ -334,7 +323,7 @@ SELinux %(domainname)s policy is very flexible allowing users to setup their %(d
 The following file types are defined for %(domainname)s:
 """ % {'domainname':self.domainname})
         for f in file_types:
-            if f.startswith(self.domainname):
+            if f.startswith(self.short_name + "_") or f.startswith(self.domainname):
                 self.fd.write("""
 
 .EX
@@ -440,5 +429,19 @@ selinux(8), %s(8), semanage(8), restorecon(8), chcon(1)
         if self.booltext != "":        
             self.fd.write(", setsebool(8)")
 
+domains = []
+if len(sys.argv) > 1:
+	alldomains = sys.argv[1:]
+
+for d in alldomains:
+	if d[:-2] + "_exec_t" not in entrypoints:
+		continue
+	name = d.split("_")[0]
+	if name in domains or name == "pam":
+		continue
+	domains.append(name)
+
+domains.sort()
+
 for domainname in domains:
-    ManPage(domainname)
+	ManPage(domainname)