From 7094777b00a7310ce966fd9e237b9cab69c9329a Mon Sep 17 00:00:00 2001
From: Noriko Hosoi <nhosoi@redhat.com>
Date: Fri, 18 Jun 2010 14:24:05 -0700
Subject: 605827 - In-place upgrade: upgrade dn format should not run in
 setup-ds-admin.pl

https://bugzilla.redhat.com/show_bug.cgi?id=605827

Description: 70upgradednformat.pl does nothing if the server is up.
The upgrade script is effective only when it's called in the Off-
line mode.
(cherry picked from commit a109da80a8eae4400b42a27bb5de604f9aee344d)
---
 ldap/admin/src/scripts/91upgradednformat.pl | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'ldap/admin/src/scripts')

diff --git a/ldap/admin/src/scripts/91upgradednformat.pl b/ldap/admin/src/scripts/91upgradednformat.pl
index 1bed3cfd..611f1e0d 100644
--- a/ldap/admin/src/scripts/91upgradednformat.pl
+++ b/ldap/admin/src/scripts/91upgradednformat.pl
@@ -11,9 +11,16 @@ use File::Copy;
 #     recursively copy the instance dir to the work dir (dnupgrade)
 #     run upgradednformat w/o -N against the DB in the work dir
 #     if it went ok, replace the original instance dir with the work dir.
+# Note: This script does nothing if the server is up.
 sub runinst {
     my ($inf, $inst, $dseldif, $conn) = @_;
 
+    # First, check if the server is up or down.
+    if ($conn->isa("Mozilla::LDAP::Conn")) {
+        # The server is up, we do nothing.
+        return ();
+    }
+
     my @errs;
 
     my $config = "cn=config";
-- 
cgit