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.

2 files changed, 6 insertions, 3 deletions

diff --git a/ldap/admin/src/scripts/DSCreate.pm.in b/ldap/admin/src/scripts/DSCreate.pm.in
index 09b7cd11..dcd55afb 100644
--- a/ldap/admin/src/scripts/DSCreate.pm.in
+++ b/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;
 
diff --git a/ldap/admin/src/scripts/DSUpdate.pm.in b/ldap/admin/src/scripts/DSUpdate.pm.in
index 3241a582..7e92bb83 100644
--- a/ldap/admin/src/scripts/DSUpdate.pm.in
+++ b/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;
 }