Changeset 2671

Timestamp:

05/05/08 14:39:39 (7 months ago)

Author:

pebenito

Message:

fcglob: add additional globs. add log file for mismatches.

Files:

• branches/fcglob/policy/modules/system/libraries.fc (modified) (3 diffs)
• branches/fcglob/support/fcglob/fcglob.py (modified) (3 diffs)

branches/fcglob/policy/modules/system/libraries.fc

@@ -4 +4 @@
-$1                              --      $2
-$1.[num_]                       --      $2
+$1.[num_].[num_]                --      $2
+$1.[num_].[num_].[num_]         --      $2
-$1.[num_][num_]                 --      $2
-$1.[num_][num_].[num_]          --      $2
+$1.[num_][num_].[num_].[num_]   --      $2
+$1.[num_][num_].[num_].[num_][num_] --  $2
-$1.[num_][num_].[num_][num_]    --      $2
-$1.[num_][num_].[num_][num_].[num_]     --      $2
-$1.[num_][num_].[num_][num_].[num_][num_] --    $2
+$1.[num_].[num_][num_]          --      $2
+$1.[num_].[num_][num_].[num_]   --      $2
+$1.[num_].[num_][num_].[num_][num_] --  $2
+$1.[num_].[num_].[num_][num_]   --      $2
-')
-
@@ -108 +116 @@
-/lib(|32|64)/security/pam_poldi.so      --      gen_context(system_u:object_r:textrel_shlib_t,s0)
-
+libver_expand(/lib(|32|64)/*.so,                gen_context(system_u:object_r:shlib_t,s0))
+libver_expand(/lib(|32|64)/*/*.so,              gen_context(system_u:object_r:shlib_t,s0))
+
-#
-# /opt
@@ -208 +219 @@
-/usr/*/lib(|32|64)/**                           gen_context(system_u:object_r:lib_t,s0)
-
+libver_expand(/usr/lib(|32|64)/*.so,            gen_context(system_u:object_r:shlib_t,s0))
+libver_expand(/usr/lib(|32|64)/*/*.so,          gen_context(system_u:object_r:shlib_t,s0))
+libver_expand(/usr/*/lib(|32|64)/*.so,          gen_context(system_u:object_r:shlib_t,s0))
+
-#/usr/(.*/)?/HelixPlayer/.+\.so(\.[^/]*)* --    gen_context(system_u:object_r:textrel_shlib_t,s0)
-libver_expand(/usr/HelixPlayer/*,so,            gen_context(system_u:object_r:textrel_shlib_t,s0))

branches/fcglob/support/fcglob/fcglob.py

@@ -1180 +1180 @@
-                selinux.matchpathcon_init(args[1])
-
+                print "Outputting mismatches to \"mismatches.log\""
+                logfile = open("mismatches.log","w")
+
-                for root, dirs, files in os.walk(args[2], topdown=True):
-                        if root in mounts:
@@ -1196 +1199 @@
-                                                st = os.stat(fi)
-                                        except:
-
+; assuming it is a regular file.
-                                                continue
-
@@ -1216 +1219 @@
-                                        # output the mismatched label
-                                        if fc != None:
-sys.stderr
+logfile
-                                        else:
-
-
-
+
+
+
+
+
+
-
-        def opgraph(args, flags):