[Fedora-directory-commits] adminserver/admserv/newinst/src setup-ds-admin.pl.in, 1.12, 1.13

[Nathan Kinder]

Author: nkinder

Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17768/admserv/newinst/src

Modified Files:
	setup-ds-admin.pl.in 
Log Message:
Resolves: 445305
Summary: Don't override settings from inf file with default values during a silent install.



Index: setup-ds-admin.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/setup-ds-admin.pl.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- setup-ds-admin.pl.in	14 Jul 2008 18:43:02 -0000	1.12
+++ setup-ds-admin.pl.in	17 Dec 2008 17:26:11 -0000	1.13
@@ -39,32 +39,59 @@
 # see if there is already a configds
 my $admConf = AdminUtil::getAdmConf("$setup->{configdir}/admin-serv");
 
-# set defaults
+# Set defaults, but don't override settings that were
+# defined in a passed in inf file.
 if ($admConf && %{$admConf}) {
-    $setup->{inf}->{General}->{ConfigDirectoryLdapURL} = $admConf->{ldapurl};
-    $setup->{inf}->{General}->{ConfigDirectoryAdminID} = $admConf->{userdn};
-    $setup->{inf}->{General}->{AdminDomain} = $admConf->{AdminDomain};
-    $setup->{inf}->{General}->{SuiteSpotUserID} = $admConf->{SuiteSpotUserID};
-    $setup->{inf}->{General}->{SuiteSpotGroup} = $admConf->{SuiteSpotGroup};
+    unless (defined($setup->{inf}->{General}->{ConfigDirectoryLdapURL})) {
+        $setup->{inf}->{General}->{ConfigDirectoryLdapURL} = $admConf->{ldapurl};
+    }
+    unless (defined($setup->{inf}->{General}->{ConfigDirectoryAdminID})) {
+        $setup->{inf}->{General}->{ConfigDirectoryAdminID} = $admConf->{userdn};
+    }
+    unless (defined($setup->{inf}->{General}->{AdminDomain})) {
+        $setup->{inf}->{General}->{AdminDomain} = $admConf->{AdminDomain};
+    }
+    unless (defined($setup->{inf}->{General}->{SuiteSpotUserID})) {
+        $setup->{inf}->{General}->{SuiteSpotUserID} = $admConf->{SuiteSpotUserID};
+    }
+    unless (defined($setup->{inf}->{General}->{SuiteSpotGroup})) {
+        $setup->{inf}->{General}->{SuiteSpotGroup} = $admConf->{SuiteSpotGroup};
+    }
+    unless (defined($setup->{inf}->{slapd}->{admin}->{SysUser})) {
+        $setup->{inf}->{admin}->{SysUser} = $admConf->{sysuser};
+    }
 
-    $setup->{inf}->{admin}->{SysUser} = $admConf->{sysuser};
     # read additional config from config DS
     my $pset = AdminUtil::getPset($admConf);
     if ($pset && %{$pset}) {
-        $setup->{inf}->{admin}->{Port} = $pset->{"configuration.nsserverport"};
+        unless (defined($setup->{inf}->{admin}->{Port})) {
+            $setup->{inf}->{admin}->{Port} = $pset->{"configuration.nsserverport"};
+        }
         $setup->{asorigport} = $pset->{"configuration.nsserverport"}; # save orig. port
-        $setup->{inf}->{admin}->{ServerIpAddress} = $pset->{"configuration.nsserveraddress"};
-        $setup->{inf}->{General}->{FullMachineName} = $pset->{"serverhostname"};
+        unless (defined($setup->{inf}->{admin}->{ServerIpAddress})) {
+            $setup->{inf}->{admin}->{ServerIpAddress} = $pset->{"configuration.nsserveraddress"};
+        }
+        unless (defined($setup->{inf}->{General}->{FullMachineName})) {
+            $setup->{inf}->{General}->{FullMachineName} = $pset->{"serverhostname"};
+        }
     }
     my $admpw = AdminUtil::getAdmpw($admConf);
     if ($admpw && %{$admpw}) {
-        $setup->{inf}->{admin}->{ServerAdminID} = $admpw->{ServerAdminID};
-        $setup->{inf}->{admin}->{ServerAdminPwd} = $admpw->{ServerAdminPwd};
+        unless (defined($setup->{inf}->{admin}->{ServerAdminID})) {
+            $setup->{inf}->{admin}->{ServerAdminID} = $admpw->{ServerAdminID};
+        }
+        unless (defined($setup->{inf}->{admin}->{ServerAdminPwd})) {
+            $setup->{inf}->{admin}->{ServerAdminPwd} = $admpw->{ServerAdminPwd};
+        }
     }
 
     # default to using the existing config DS
-    $setup->{inf}->{slapd}->{UseExistingMC} = 1;
-    $setup->{inf}->{slapd}->{SlapdConfigForMC} = 0;
+    unless (defined($setup->{inf}->{slapd}->{UseExistingMC})) {
+        $setup->{inf}->{slapd}->{UseExistingMC} = 1;
+    }
+    unless (defined($setup->{inf}->{slapd}->{SlapdConfigForMC})) {
+        $setup->{inf}->{slapd}->{SlapdConfigForMC} = 0;
+    }
     $setup->{reconfigas} = 1; # allow AS reconfig
 }