This is an automated email from the git hooks/post-receive script.
mreynolds pushed a commit to branch 389-ds-base-1.3.5
in repository 389-ds-base.
commit 9132065cc369a9caf1f14312f71d6f1dd343e3e8
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Mon Apr 17 17:06:19 2017 -0400
Issue 49221 - During an upgrade the provided localhost name is ignored
Description: If the FullMachine name, or localhost, is provided in an INF
it is ignored during the upgrade the value of nsslapd-localhost
from the current server is used instead. We should only override
the localhost value if it is missing.
https://pagure.io/389-ds-base/issue/49221
Reviewed by: nhosoi(Thanks!)
(cherry picked from commit 8979cc699a7bd0459a9285f66dca472e8108b1ad)
---
ldap/admin/src/scripts/DSUpdate.pm.in | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ldap/admin/src/scripts/DSUpdate.pm.in
b/ldap/admin/src/scripts/DSUpdate.pm.in
index e84a9a9..8b24b47 100644
--- a/ldap/admin/src/scripts/DSUpdate.pm.in
+++ b/ldap/admin/src/scripts/DSUpdate.pm.in
@@ -435,7 +435,9 @@ sub initInfFromInst {
my $servid = $inst;
$servid =~ s/slapd-//;
- $inf->{General}->{FullMachineName} =
$entry->getValue("nsslapd-localhost");
+ if (!$inf->{General}->{FullMachineName}) {
+ $inf->{General}->{FullMachineName} =
$entry->getValue("nsslapd-localhost");
+ }
$inf->{General}->{SuiteSpotUserID} =
$entry->getValue("nsslapd-localuser");
$inf->{slapd}->{ServerPort} = $entry->getValue("nsslapd-port");
$inf->{slapd}->{ldapifilepath} =
$entry->getValue("nsslapd-ldapifilepath");
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.