- don't set $o->{security} until accepted (#33567)

2 files changed, 7 insertions, 4 deletions

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index edf08198b..d997a9eef 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,5 @@
 - fix typo breaking reading fstab with UUID= entries
+- don't set $o->{security} until accepted (#33567)
 
 Version 10.4.195 - 14 September 2007, by Olivier "blino" Blin
 
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 0be070e22..5e6c04aa0 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -952,9 +952,11 @@ sub summary {
 	},
 	clicked => sub {
 	    require security::level;
+	    my $security = $o->{security};
        set_sec_level:
-	    if (security::level::level_choose($o, \$o->{security}, \$o->{libsafe}, \$o->{security_user})) {
-             check_security_level($o) or goto set_sec_level;
+	    if (security::level::level_choose($o, \$security, \$o->{libsafe}, \$o->{security_user})) {
+             check_security_level($o, $security) or goto set_sec_level;
+	     $o->{security} = $security;
              install::any::set_security($o);
          }
 	},
@@ -1036,8 +1038,8 @@ try to force installation even if that destroys the first partition?"));
 }
 
 sub check_security_level {
-    my ($o) = @_;
-	if ($o->{security} > 2 && find { $_->{fs_type} eq 'vfat' } @{$o->{fstab}}) {
+    my ($o, $security) = @_;
+	if ($security > 2 && find { $_->{fs_type} eq 'vfat' } @{$o->{fstab}}) {
 	    $o->ask_okcancel('', N("In this security level, access to the files in the Windows partition is restricted to the administrator.")) or return 0;
      }
      return 1;