[389-commits] ldap/admin

[Richard Allen Megginson]

 ldap/admin/src/scripts/DSDialogs.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f227f11c46f6e57fb28f348cef6e2334008297d7
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sat Apr 21 14:15:57 2012 +0100

    Suppress alert on unavailable port with forced setup

diff --git a/ldap/admin/src/scripts/DSDialogs.pm b/ldap/admin/src/scripts/DSDialogs.pm
index 60bc115..08c8b2b 100644
--- a/ldap/admin/src/scripts/DSDialogs.pm
+++ b/ldap/admin/src/scripts/DSDialogs.pm
@@ -66,7 +66,7 @@ my $dsport = new Dialog (
         my $res = $DialogManager::SAME;
         if ($ans !~ /^\d+$/) {
             $self->{manager}->alert("dialog_dsport_invalid", $ans);
-        } elsif (!portAvailable($ans)) {
+        } elsif (!portAvailable($ans) && !$self->{manager}->{setup}->{force}) {
             $self->{manager}->alert("dialog_dsport_error", $ans);
         } else {
             $res = $DialogManager::NEXT;