From eb25bdff89df7f3f3a7dc31ffa5d8ac1aaf1cc78 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Sep 25 2009 18:07:07 +0000
Subject: setup-ds-admin.pl should use correct default hostname + port

https://bugzilla.redhat.com/show_bug.cgi?id=525785
Resolves: bug 525785
Bug Description: setup-ds-admin.pl should use correct default hostname + port
Reviewed by: nkinder (Thanks!)
Fix Description: We were not setting a default hostname and port in silent
mode.  I also fixed a problem with the SysUser setting.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no

---

diff --git a/admserv/newinst/src/setup-ds-admin.pl.in b/admserv/newinst/src/setup-ds-admin.pl.in
index 1583485..65c2d1a 100644
--- a/admserv/newinst/src/setup-ds-admin.pl.in
+++ b/admserv/newinst/src/setup-ds-admin.pl.in
@@ -59,7 +59,7 @@ if ($admConf && %{$admConf}) {
     unless (defined($setup->{inf}->{General}->{SuiteSpotGroup})) {
         $setup->{inf}->{General}->{SuiteSpotGroup} = $admConf->{SuiteSpotGroup};
     }
-    unless (defined($setup->{inf}->{slapd}->{admin}->{SysUser})) {
+    unless (defined($setup->{inf}->{admin}->{SysUser})) {
         $setup->{inf}->{admin}->{SysUser} = $admConf->{sysuser};
     }
 
@@ -161,7 +161,20 @@ if (!$setup->{silent}) {
     }
 }
 
+
 # set default values
+if (!defined($setup->{inf}->{General}->{FullMachineName})) {
+    $setup->{inf}->{General}->{FullMachineName} = hostfqdn;
+}
+
+if (!defined($setup->{inf}->{slapd}->{ServerPort})) {
+    my $port = 389;
+    if (!portAvailable($port)) {
+        $port = getAvailablePort();
+    }
+    $setup->{inf}->{slapd}->{ServerPort} = $port;
+}
+
 my $createconfigds;
 if ((defined($setup->{inf}->{slapd}->{SlapdConfigForMC}) and
      ("yes" =~ /^$setup->{inf}->{slapd}->{SlapdConfigForMC}/i)) or