From cbf1401f1e891252b5863e9c6aa161a56753f552 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Oudot?= <clement@oodo.net>
Date: Mon, 3 May 2010 14:18:40 +0000
Subject: [PATCH] Declare Zimbra preauth in other grant subroutines

---
 .../lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Simple.pm  | 5 -----
 modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Menu.pm  | 2 +-
 modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_SOAP.pm | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Simple.pm b/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Simple.pm
index 4d971a864..dfbaeb595 100644
--- a/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Simple.pm
+++ b/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Simple.pm
@@ -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;
 
diff --git a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Menu.pm b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Menu.pm
index 7575bfb3e..c2a055318 100644
--- a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Menu.pm
+++ b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Menu.pm
@@ -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;
diff --git a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_SOAP.pm b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_SOAP.pm
index 3f060f4fa..850915412 100644
--- a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_SOAP.pm
+++ b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_SOAP.pm
@@ -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;