summaryrefslogtreecommitdiff
path: root/fml/lib/FML/Command
diff options
context:
space:
mode:
authorfukachan <fukachan>2005-05-30 03:28:06 +0000
committerfukachan <fukachan>2005-05-30 03:28:06 +0000
commit968bd7391ebef63d6ca2e840dced9efb97f2a2de (patch)
tree9d05bf8bd63485e27f2dffbd01b61dd6ea1fdd22 /fml/lib/FML/Command
parentf0705eef851f5d451e98611e69aafb1f622b2f48 (diff)
downloadfml8-968bd7391ebef63d6ca2e840dced9efb97f2a2de.tar.gz
fml8-968bd7391ebef63d6ca2e840dced9efb97f2a2de.tar.bz2
fml8-968bd7391ebef63d6ca2e840dced9efb97f2a2de.zip
${admin,}command_mail_restrictions support "check_pgp_signature" rule.
Both restrictions uses same rule name but which needs different keyring directories. So, we need to handle carefully the context of two restrictions.
Diffstat (limited to 'fml/lib/FML/Command')
-rw-r--r--fml/lib/FML/Command/User/admin.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/fml/lib/FML/Command/User/admin.pm b/fml/lib/FML/Command/User/admin.pm
index 8d388220..3e323d5d 100644
--- a/fml/lib/FML/Command/User/admin.pm
+++ b/fml/lib/FML/Command/User/admin.pm
@@ -4,7 +4,7 @@
# All rights reserved. This program is free software; you can
# redistribute it and/or modify it under the same terms as Perl itself.
#
-# $FML: admin.pm,v 1.10 2004/07/23 15:59:04 fukachan Exp $
+# $FML: admin.pm,v 1.11 2004/12/05 16:19:07 fukachan Exp $
#
package FML::Command::User::admin;
@@ -223,6 +223,7 @@ sub _apply_new_admin_command_mail_restrictions
my $sender = $opt_args->{ address } || '';
# initialize admin command specific area to pass it to sub layer.
+ $curproc->command_context_set_try_admin_auth_request();
$context->{ admin_option } = $opt_args || {};
# command restriction rules
@@ -253,6 +254,7 @@ sub _apply_new_admin_command_mail_restrictions
# delete admin command specific data area.
delete $context->{ admin_option };
+ $curproc->command_context_reset_try_admin_auth_request();
# determine action.
if ($match) {