Fix setting of error message

https://sourceforge.net/tracker/index.php?func=detail&aid=3412232&group_id=17457&atid=117457#

diff --git a/samba/acl_security.pl b/samba/acl_security.pl
index a27d338..bf58b5e 100755 (executable)
--- a/samba/acl_security.pl
+++ b/samba/acl_security.pl
@@ -221,7 +221,6 @@ print "</table> </td> </tr>\n";
 sub acl_security_save
 {
 if ($in{'r_fs'} < $in{'w_fs'} || $in{'r_ps'} < $in{'w_ps'}) {
-       $whatfailed = $text{'acl_err'};
        &error($text{'acl_ernow'});
        }
 $_[0]->{'apply'}=$in{'apply'};

diff --git a/samba/save_euser.cgi b/samba/save_euser.cgi
index 7d0a95b..af2ff09 100755 (executable)
--- a/samba/save_euser.cgi
+++ b/samba/save_euser.cgi
@@ -10,7 +10,7 @@ require './samba-lib.pl';
 &error("$text{'eacl_np'} $text{'eacl_pmusers'}")
         unless $access{'maint_users'} && $access{'view_users'};
 # save         
-$whatfailed = $text{'saveuser_fail'};
+&error_setup($text{'saveuser_fail'});
 &lock_file($config{'smb_passwd'});
 @list = &list_users();
 $u = $list[$in{'idx'}];

diff --git a/samba/save_fmisc.cgi b/samba/save_fmisc.cgi
index 663d834..3c23566 100755 (executable)
--- a/samba/save_fmisc.cgi
+++ b/samba/save_fmisc.cgi
@@ -13,7 +13,7 @@ require './samba-lib.pl';
 &error("$text{'eacl_np'} $text{'eacl_pufmisc'}")
             unless &can('rwoO', \%access, $in{old_name});
 # save
-$whatfailed = $text{'savefmisc_fail'};
+&error_setup($text{'savefmisc_fail'});
 # Random options
 &setval("mangled map", $in{mangled_map});
 &setval("locking", $in{locking});

diff --git a/samba/save_fname.cgi b/samba/save_fname.cgi
index 6ce4d83..322cce2 100755 (executable)
--- a/samba/save_fname.cgi
+++ b/samba/save_fname.cgi
@@ -13,7 +13,7 @@ require './samba-lib.pl';
 &error("$text{'eacl_np'} $text{'eacl_pufname'}")
             unless &can('rwnN', \%access, $in{old_name});
 # save
-$whatfailed = $text{'error_savename'};
+&error_setup($text{'error_savename'});
 # File nameing options
 &setval("mangle case", $in{mangle_case});
 &setval("case sensitive", $in{case_sensitive});

diff --git a/samba/save_fperm.cgi b/samba/save_fperm.cgi
index a013318..e5791e8 100755 (executable)
--- a/samba/save_fperm.cgi
+++ b/samba/save_fperm.cgi
@@ -13,7 +13,7 @@ require './samba-lib.pl';
 &error("$text{'eacl_np'} $text{'eacl_pufperm'}")
             unless &can('rwpP', \%access, $in{old_name});
 # save
-$whatfailed = $text{'savefperm_fail'};
+&error_setup($text{'savefperm_fail'});
 # File nameing options
 $in{create_mode} =~ /^0?[0-7]{3}$/ ||
        &error(&text('savefperm_mode', $in{create_mode}));

diff --git a/samba/save_fshare.cgi b/samba/save_fshare.cgi
index 2f8ad49..28fc0ce 100755 (executable)
--- a/samba/save_fshare.cgi
+++ b/samba/save_fshare.cgi
@@ -18,7 +18,7 @@ else {
     &error("$text{'eacl_np'} $text{'eacl_pcrs'}") unless $access{'c_fs'};
        }
 
-$whatfailed = $text{'savefshare_fail'};
+&error_setup($text{'savefshare_fail'});
 # store share options
 if ($in{old_name} eq "global") {
        $name = "global";

diff --git a/samba/save_misc.cgi b/samba/save_misc.cgi
index b1022d9..7f75cb4 100755 (executable)
--- a/samba/save_misc.cgi
+++ b/samba/save_misc.cgi
@@ -12,7 +12,7 @@ $global = &get_share("global");
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pcm'}") unless $access{'conf_misc'};
  
-$whatfailed = $text{'savemisc_fail'};
+&error_setup($text{'savemisc_fail'});
 &setval("debug level", $in{debug_level}, "");
 
 &setval("getwd cache", $in{getwd_cache}, "no");

diff --git a/samba/save_net.cgi b/samba/save_net.cgi
index b04d3e8..1727d70 100755 (executable)
--- a/samba/save_net.cgi
+++ b/samba/save_net.cgi
@@ -12,7 +12,7 @@ $global = &get_share("global");
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pcn'}") unless $access{'conf_net'};
 
-$whatfailed = $text{'savenet_fail'};
+&error_setup($text{'savenet_fail'});
 if (!$in{dead_time_def} && $in{dead_time} !~ /^\d+$/) {
        &error(&text('savenet_timeout', $in{dead_time}));
        }

diff --git a/samba/save_pass.cgi b/samba/save_pass.cgi
index 41d31dd..dcb2ccd 100755 (executable)
--- a/samba/save_pass.cgi
+++ b/samba/save_pass.cgi
@@ -12,7 +12,7 @@ $global = &get_share("global");
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pcp'}") unless $access{'conf_pass'};
 
-$whatfailed = $text{'savepass_fail'};
+&error_setup($text{'savepass_fail'});
 $nopass = (`$config{samba_password_program} 2>&1 </dev/null` =~ /encryption not selected/);
 if ($in{encrypt_passwords} eq "yes" && $nopass) {
        &error($text{'savepass_nopass'});

diff --git a/samba/save_popts.cgi b/samba/save_popts.cgi
index 0451a54..cc72fcd 100755 (executable)
--- a/samba/save_popts.cgi
+++ b/samba/save_popts.cgi
@@ -13,7 +13,7 @@ require './samba-lib.pl';
 &error("$text{'eacl_np'} $text{'eacl_pupopt'}")
                unless &can('rwoO', \%access, $in{old_name});
 # save
-$whatfailed = $text{'savepopts_fail'};
+&error_setup($text{'savepopts_fail'});
 # printer options
 $in{min_print_space} =~ /^\d+$/ ||
        &error($text{'savepopts_number'});

diff --git a/samba/save_print.cgi b/samba/save_print.cgi
index 71fcd58..455aa90 100755 (executable)
--- a/samba/save_print.cgi
+++ b/samba/save_print.cgi
@@ -12,7 +12,7 @@ $global = &get_share("global");
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pcprint'}") unless $access{'conf_print'};
  
-$whatfailed = $text{'saveprint_fail'};
+&error_setup($text{'saveprint_fail'});
 &setval("printing", $in{printing}, "");
 
 &setval("load printers", $in{load_printers}, "");

diff --git a/samba/save_pshare.cgi b/samba/save_pshare.cgi
index 37692af..9700331 100755 (executable)
--- a/samba/save_pshare.cgi
+++ b/samba/save_pshare.cgi
@@ -18,7 +18,7 @@ else {
     &error("$text{'eacl_np'} $text{'eacl_pcrs'}") unless $access{'c_ps'};
     }
 
-$whatfailed = $text{'savepshare_fail'};
+&error_setup($text{'savepshare_fail'});
 if ($in{old_name} eq "global") {
        $name = "global";
        }

diff --git a/samba/save_sec.cgi b/samba/save_sec.cgi
index 6487934..b101496 100755 (executable)
--- a/samba/save_sec.cgi
+++ b/samba/save_sec.cgi
@@ -13,7 +13,7 @@ require './samba-lib.pl';
 &error("$text{'eacl_np'} $text{'eacl_pusec'}")
                unless &can('rwsS', \%access, $in{old_name});
 # save                         
-$whatfailed = $text{'savesec_fail'};
+&error_setup($text{'savesec_fail'});
 &delval("read only");
 &setval("writeable", $in{writeable});
 if ($in{guest} == 0) {

diff --git a/samba/save_smb.cgi b/samba/save_smb.cgi
index fde2e1b..930c284 100755 (executable)
--- a/samba/save_smb.cgi
+++ b/samba/save_smb.cgi
@@ -12,7 +12,7 @@ $global = &get_share("global");
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pcs'}") unless $access{'conf_smb'};
 
-$whatfailed = $text{'savesmb_fail'};
+&error_setup($text{'savesmb_fail'});
 &setval("workgroup", $in{workgroup_def} ? "" : $in{workgroup}, "");
 
 if ($in{'wins'} == 0) {

diff --git a/samba/swat_save.cgi b/samba/swat_save.cgi
index 0aac099..bf85323 100755 (executable)
--- a/samba/swat_save.cgi
+++ b/samba/swat_save.cgi
@@ -10,7 +10,7 @@ require './samba-lib.pl';
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pcswat'}") unless $access{'swat'};
  
-$whatfailed = $text{'swats_fail'};
+&error_setup($text{'swats_fail'});
 $in{'user'} || &error($text{'swats_user'});
 &write_file("$module_config_directory/swat", { 'user' => $in{'user'},
                                               'pass' => $in{'pass'} });