Browse Source

Bug 703703 - setup-ds-admin.pl asks for legal agreement to a non-existant file

https://bugzilla.redhat.com/show_bug.cgi?id=703703
Resolves: bug 703703
Bug Description: setup-ds-admin.pl asks for legal agreement to a non-existant file
Reviewed by: nkinder (Thanks!)
Branch: master
Fix Description: According to the Red Hat Legal department, we do not need
to display or ask the user to accept the EULA any more.  The EULA dialog
and text has been removed.
Platforms tested: RHEL6 x86_64
Flag Day: no
Doc impact: Yes - will need a slight amendment to the Install Guide.
Rich Megginson 14 years ago
parent
commit
c8e821c11e
2 changed files with 1 additions and 22 deletions
  1. 1 17
      ldap/admin/src/scripts/SetupDialogs.pm.in
  2. 0 5
      ldap/admin/src/scripts/setup-ds.res.in

+ 1 - 17
ldap/admin/src/scripts/SetupDialogs.pm.in

@@ -62,22 +62,6 @@ my $welcome = new DialogYesNo (
     ['dialog_welcome_prompt'],
 );
 
-my $license = new DialogYesNo (
-    $EXPRESS,
-    'dialog_license_text',
-    0,
-    sub {
-        my $self = shift;
-        my $ans = shift;
-        my $res = $self->handleResponse($ans);
-        if ($res == $DialogManager::NEXT) {
-            $res = $DialogManager::ERR if (!$self->isYes());
-        }
-        return $res;
-    },
-    ['dialog_license_prompt']
-);
-
 my $dsktune = new DialogYesNo (
     $EXPRESS,
     'dialog_dsktune_text',
@@ -278,7 +262,7 @@ my $usergroup = new Dialog (
 
 
 sub getDialogs {
-    return ($welcome, $license, $dsktune, $setuptype, $hostdlg, $usergroup);
+    return ($welcome, $dsktune, $setuptype, $hostdlg, $usergroup);
 }
 
 sub getRegDialogs {

+ 0 - 5
ldap/admin/src/scripts/setup-ds.res.in

@@ -12,11 +12,6 @@ dialog_welcome_text = This program will set up the %s Directory Server.\n\nIt is
 
 dialog_welcome_prompt = Would you like to continue with set up?
 
-# ----------- License Dialog Resource  -----------
-dialog_license_text = BY SETTING UP AND USING THIS SOFTWARE YOU ARE CONSENTING TO BE BOUND BY\nAND ARE BECOMING A PARTY TO THE AGREEMENT FOUND IN THE\nLICENSE.TXT FILE. IF YOU DO NOT AGREE TO ALL OF THE TERMS\nOF THIS AGREEMENT, PLEASE DO NOT SET UP OR USE THIS SOFTWARE.\n\n
-
-dialog_license_prompt = Do you agree to the license terms?
-
 # ----------- dsktune Dialog Resource  -----------
 dialog_dsktune_text = Your system has been scanned for potential problems, missing patches,\
 etc.  The following output is a report of the items found that need to\