瀏覽代碼

Bug 572355 - Label instance files and ports during upgrade.

The instance files and ports need to be labelled with the proper
SELinux contexts during an upgrade.  This patch exports the routine
used to update the policy during regular setup so we can use it
when upgrading.
Nathan Kinder 15 年之前
父節點
當前提交
e72f8af0be
共有 2 個文件被更改,包括 6 次插入3 次删除
  1. 2 2
      ldap/admin/src/scripts/DSCreate.pm.in
  2. 4 1
      ldap/admin/src/scripts/DSUpdate.pm.in

+ 2 - 2
ldap/admin/src/scripts/DSCreate.pm.in

@@ -64,8 +64,8 @@ use Mozilla::LDAP::LDIF;
 
 use Exporter;
 @ISA       = qw(Exporter);
-@EXPORT    = qw(createDSInstance removeDSInstance setDefaults createInstanceScripts makeOtherConfigFiles installSchema);
-@EXPORT_OK = qw(createDSInstance removeDSInstance setDefaults createInstanceScripts makeOtherConfigFiles installSchema);
+@EXPORT    = qw(createDSInstance removeDSInstance setDefaults createInstanceScripts makeOtherConfigFiles installSchema updateSelinuxPolicy);
+@EXPORT_OK = qw(createDSInstance removeDSInstance setDefaults createInstanceScripts makeOtherConfigFiles installSchema updateSelinuxPolicy);
 
 use strict;
 

+ 4 - 1
ldap/admin/src/scripts/DSUpdate.pm.in

@@ -47,7 +47,7 @@ package DSUpdate;
 use DSUtil;
 use Inf;
 use FileConn;
-use DSCreate qw(setDefaults createInstanceScripts makeOtherConfigFiles);
+use DSCreate qw(setDefaults createInstanceScripts makeOtherConfigFiles updateSelinuxPolicy);
 
 use File::Basename qw(basename dirname);
 
@@ -405,6 +405,9 @@ sub updateDSInstance {
     }
 
     $conn->close();
+
+    updateSelinuxPolicy($inf);
+
     return @errs;
 }