Correct form number

diff --git a/spam/acl_security.pl b/spam/acl_security.pl
index 6b8ed1b..9cc3194 100644 (file)
--- a/spam/acl_security.pl
+++ b/spam/acl_security.pl
@@ -28,10 +28,10 @@ print "<td>",&ui_radio("awl_mode", $_[0]->{'awl_groups'} ? 2 :
        [ [ 0, $text{'acl_awl0'}."<br>\n" ],
          [ 1, &text('acl_awl1',
                &ui_textbox("awl_users", $_[0]->{'awl_users'}, 40).
-               &user_chooser_button("awl_users", 1)."<br>\n" ],
+               &user_chooser_button("awl_users", 1))."<br>\n" ],
          [ 2, &text('acl_awl2',
                &ui_textbox("awl_groups", $_[0]->{'awl_groups'}, 40).
-               &group_chooser_button("awl_users", 1)."<br>\n" ],
+               &group_chooser_button("awl_users", 1))."<br>\n" ],
        ]),"</td> </tr>\n";
 }
 

diff --git a/spam/edit_awl.cgi b/spam/edit_awl.cgi
index f945d43..0aa718f 100644 (file)
--- a/spam/edit_awl.cgi
+++ b/spam/edit_awl.cgi
@@ -1,6 +1,5 @@
 #!/usr/local/bin/perl
 # Display entries in the auto-whitelist
-# XXX delete all
 
 require './spam-lib.pl';
 &can_use_check("awl");
@@ -15,6 +14,7 @@ if (&supports_auto_whitelist() == 2) {
        print &ui_user_textbox("user", $in{'user'}),"\n",
              &ui_submit($text{'awl_uok'});
        print &ui_form_end();
+       $formno++;
 
        if (!$in{'user'}) {
                # Can't do any more
@@ -30,7 +30,7 @@ if (!&can_edit_awl($in{'user'})) {
        &ui_print_endpage("<b>".&text('awl_cannotuser',
                "<tt>".&html_escape($in{'user'})."</tt>")."</b>");
        }
-elsif (!defined(getpwnam($in{'user'}))) {
+elsif (!defined(getpwnam($in{'user'})) && !$module_info{'usermin'}) {
        &ui_print_endpage("<b>".&text('awl_nouser',
                "<tt>".&html_escape($in{'user'})."</tt>")."</b>");
        }