From b3cc87747c5b2e197354364455e7b1ab20b1d258 Mon Sep 17 00:00:00 2001
From: unknown <unknown@redhat.com>
Date: Apr 09 2009 01:05:55 +0000
Subject: This commit was manufactured by cvs2git to create tag

'FedoraDirSrvAdmin_1_1_7_RC2_20090403'.
---

diff --git a/admserv/newinst/src/AdminServer.pm.in b/admserv/newinst/src/AdminServer.pm.in
index f687bc5..4afa52c 100644
--- a/admserv/newinst/src/AdminServer.pm.in
+++ b/admserv/newinst/src/AdminServer.pm.in
@@ -21,10 +21,10 @@ require Exporter;
 @ISA       = qw(Exporter);
 @EXPORT    = qw(createAdminServer reconfigAdminServer
                 createASFilesAndDirs setFileOwnerPerms updateHttpConfFiles
-                startAdminServer removeAdminServer setDefaults);
+                startAdminServer removeAdminServer);
 @EXPORT_OK = qw(createAdminServer reconfigAdminServer
                 createASFilesAndDirs setFileOwnerPerms updateHttpConfFiles
-                startAdminServer removeAdminServer setDefaults);
+                startAdminServer removeAdminServer);
 
 use File::Path;
 # tempfiles
@@ -41,51 +41,16 @@ use Inf;
 use Setup;
 use AdminUtil;
 
-sub setDefaults {
-    my $setup = shift;
-
-    if (!defined($setup->{inf}->{admin}->{ServerIpAddress})) {
-        $setup->{inf}->{admin}->{ServerIpAddress} = '@admservip@';
-    }
-    if (!defined($setup->{inf}->{admin}->{Port})) {
-        $setup->{inf}->{admin}->{Port} = @admservport@;
-    }
-    if (!defined($setup->{inf}->{admin}->{SysUser})) {
-        my $user = $setup->{inf}->{General}->{SuiteSpotUserID};
-        if (!defined($user)) {
-            if ($> == 0) { # if root, use the default user
-                $user = "@httpduser@";
-            } else { # if not root, use the user's uid
-                $user = getLogin;
-            }
-        }
-        $setup->{inf}->{admin}->{SysUser} = $user;
-    }
-    if (!defined($setup->{inf}->{admin}->{ServerAdminID})) {
-        my $id = $setup->{inf}->{General}->{ConfigDirectoryAdminID};
-        if (isValidDN($id)) {
-            $id =~ s/^(.*)=.*/$1/;
-        }
-        $setup->{inf}->{admin}->{ServerAdminID} = $id;
-    }
-    if (!defined($setup->{inf}->{admin}->{ServerAdminPwd})) {
-        my $pwd = $setup->{inf}->{General}->{ConfigDirectoryAdminPwd};
-        $setup->{inf}->{admin}->{ServerAdminPwd} = $pwd;
-    }
-
-    return 1;
-}
-
 sub checkRequiredParameters {
     my $setup = shift;
-    for my $asparam (qw(ServerIpAddress Port SysUser ServerAdminID ServerAdminPwd)) {
+    for my $asparam (qw(Port SysUser ServerAdminID ServerAdminPwd)) {
         if (!defined($setup->{inf}->{admin}->{$asparam})) {
             $setup->msg($FATAL, "missing_adminserver_param", $asparam);
             return 0;
         }
     }
 
-    for my $general (qw(AdminDomain SuiteSpotUserID SuiteSpotGroup ConfigDirectoryLdapURL)) {
+    for my $general (qw(SuiteSpotUserID SuiteSpotGroup ConfigDirectoryLdapURL)) {
         if (!defined($setup->{inf}->{General}->{$general})) {
             $setup->msg($FATAL, "missing_general_param", $general);
             return 0;
@@ -469,10 +434,6 @@ sub createAdminServer {
         $setup->msg('begin_create_adminserver');
     }
 
-    if (!setDefaults($setup)) {
-        return 0;
-    }
-
     if (!checkRequiredParameters($setup)) {
         return 0;
     }
diff --git a/admserv/newinst/src/setup-ds-admin.pl.in b/admserv/newinst/src/setup-ds-admin.pl.in
index e526adb..531e324 100644
--- a/admserv/newinst/src/setup-ds-admin.pl.in
+++ b/admserv/newinst/src/setup-ds-admin.pl.in
@@ -30,7 +30,6 @@ use DSCreate;
 use AdminUtil;
 use AdminServer;
 use Util;
-use Net::Domain qw(hostfqdn);
 
 my $res = new Resource("@propertydir@/setup-ds.res",
                        "@propertydir@/setup-ds-admin.res");
@@ -94,14 +93,6 @@ if ($admConf && %{$admConf}) {
         $setup->{inf}->{slapd}->{SlapdConfigForMC} = 0;
     }
     $setup->{reconfigas} = 1; # allow AS reconfig
-} else {
-    # default to creating the config DS
-    unless (defined($setup->{inf}->{slapd}->{UseExistingMC})) {
-        $setup->{inf}->{slapd}->{UseExistingMC} = 0;
-    }
-    unless (defined($setup->{inf}->{slapd}->{SlapdConfigForMC})) {
-        $setup->{inf}->{slapd}->{SlapdConfigForMC} = "yes";
-    }
 }
 
 # do not allow reconfig (setup -r) if no setup has been done
@@ -154,7 +145,6 @@ if (!$setup->{silent}) {
     }
 }
 
-# set default values
 my $createconfigds;
 if ((defined($setup->{inf}->{slapd}->{SlapdConfigForMC}) and
      ("yes" =~ /^$setup->{inf}->{slapd}->{SlapdConfigForMC}/i)) or
@@ -169,24 +159,6 @@ if ((defined($setup->{inf}->{slapd}->{SlapdConfigForMC}) and
     $createconfigds = 1;
 }
 
-if (!defined($setup->{inf}->{General}->{ConfigDirectoryAdminID})) {
-    $setup->{inf}->{General}->{ConfigDirectoryAdminID} = "admin";
-}
-
-if (!defined($setup->{inf}->{General}->{AdminDomain})) {
-    my $admindomain = $setup->{inf}->{General}->{FullMachineName} ||
-        hostfqdn;
-    $admindomain =~ s/^[^\.]*\.//; # just the domain part
-    $setup->{inf}->{General}->{AdminDomain} = $admindomain;
-}
-
-if (!defined($setup->{inf}->{General}->{SuiteSpotGroup})) {
-    $setup->{inf}->{General}->{SuiteSpotGroup} = "@httpdgroup@";
-}
-
-# for admin server too, since ServerAdminID is used by AdminUtil code
-AdminServer::setDefaults($setup);
-
 $setup->{inf}->write();
 
 my @errs;
diff --git a/pkg/fedora-ds-admin.spec b/pkg/fedora-ds-admin.spec
index 0d6259c..f1fcec1 100644
--- a/pkg/fedora-ds-admin.spec
+++ b/pkg/fedora-ds-admin.spec
@@ -4,7 +4,7 @@
 Summary:          Fedora Administration Server (admin)
 Name:             fedora-ds-admin
 Version:          1.1.7
-Release:          3%{?dist}
+Release:          2%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -147,11 +147,6 @@ fi
 %{_mandir}/man8/*
 
 %changelog
-* Wed Apr  8 2009 Rich Megginson <rmeggins@redhat.com> - 1.1.7-3
-- Resolves: bug 494980
-- Description: setup-ds-admin.pl -u and silent setup complain about ServerIpAddress
-- CVS tag FedoraDirSrvAdmin_1_1_7_RC3 FedoraDirSrvAdmin_1_1_7_RC3_20090408
-
 * Fri Apr  3 2009 Rich Megginson <rmeggins@redhat.com> - 1.1.7-2
 - Resolves: bug 493989
 - Description: Admin Server: valgrind invalid read in security.c when installing CRL