ldap/admin/src/scripts/DSCreate.pm.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6a1c2737ee49ba295ffae5a49265dcaa9debf09d
Author: Nathan Kinder <nkinder(a)redhat.com>
Date: Mon Oct 11 11:23:28 2010 -0700
Bug 544321 - remove-ds.pl should not throw error unlabelling port
When removing an instance using remove-ds.pl, a fatal error will
be thrown when trying to remove the SELinux port label if the port
is not labelled. This patch makes this case a non-error since
there is no need to complain about removing a label if it has
already been removed.
diff --git a/ldap/admin/src/scripts/DSCreate.pm.in
b/ldap/admin/src/scripts/DSCreate.pm.in
index a156f10..b04e54c 100644
--- a/ldap/admin/src/scripts/DSCreate.pm.in
+++ b/ldap/admin/src/scripts/DSCreate.pm.in
@@ -1194,7 +1194,7 @@ sub removeDSInstance {
{
my $semanage_err = `semanage port -d -t ldap_port_t -p tcp $port
2>&1`;
if ($? != 0) {
- if ($semanage_err !~ /defined in policy, cannot be deleted/) {
+ if (($semanage_err !~ /defined in policy, cannot be deleted/) &&
($semanage_err !~ /is not defined/)) {
push @errs, [ 'error_removing_port_label', $port,
$semanage_err];
debug(1, "Warning: Port $port not removed from selinux policy
correctly. Error: $semanage_err\n");
}
@@ -1205,7 +1205,7 @@ sub removeDSInstance {
{
my $semanage_err = `semanage port -d -t ldap_port_t -p tcp $secureport
2>&1`;
if ($? != 0) {
- if ($semanage_err !~ /defined in policy, cannot be deleted/) {
+ if (($semanage_err !~ /defined in policy, cannot be deleted/) &&
($semanage_err !~ /is not defined/)) {
push @errs, [ 'error_removing_port_label', $secureport,
$semanage_err];
debug(1, "Warning: Port $secureport not removed from selinux
policy correctly. Error: $semanage_err\n");
}
Show replies by date