Declare Zimbra preauth in other grant subroutines

This commit is contained in:
Clément Oudot 2010-05-03 14:18:40 +00:00
parent 4bd444d427
commit cbf1401f1e
3 changed files with 2 additions and 7 deletions

View File

@ -611,11 +611,6 @@ sub conditionSub {
my ( $ZimbraPreAuthKey, $ZimbraAccount, $ZimbraBy, $ZimbraUri ) =
( $1, $2, $3, $4 );
$class->lmLog(
"Calling Zimbra preauth with $ZimbraPreAuthKey, $ZimbraAccount, $ZimbraBy and $ZimbraUri",
'debug'
);
my $ZimbraExpires = 0;
my $ZimbraTimestamp = gmtime() * 1000;

View File

@ -559,7 +559,7 @@ sub _compileRules {
sub _conditionSub {
my ( $self, $cond ) = splice @_;
return sub { 1 }
if ( $cond =~ /^(?:accept|unprotect)$/i );
if ( $cond =~ /^(?:accept$|unprotect$|zimbra_preauth)/i );
return sub { 0 }
if ( $cond =~ /^(?:deny$|logout)/i );
$cond =~ s/\$date/&POSIX::strftime("%Y%m%d%H%M%S",localtime())/e;

View File

@ -356,7 +356,7 @@ sub _conditionSub {
my ( $self, $id, $cond ) = splice @_;
my $h = $self->getApacheSession( $id, 1 );
return sub { 1 }
if ( $cond =~ /^(?:accept|unprotect)$/i );
if ( $cond =~ /^(?:accept$|unprotect$|zimbra_preauth)/i );
return sub { 0 }
if ( !$h or $cond =~ /^(?:deny$|logout)/i );
$cond =~ s/\$date/&POSIX::strftime("%Y%m%d%H%M%S",localtime())/e;