amavis-user January 2011 archive
Main Archive Page > Month Archives  > amavis-user archives
amavis-user: Re: [AMaViS-user] new: amavisd-new-2.7.0-pre13

Re: [AMaViS-user] new: amavisd-new-2.7.0-pre13

From: Mark Martinec <Mark.Martinec+amavis_at_nospam>
Date: Wed Jan 26 2011 - 15:28:40 GMT
To: amavis-user@lists.sourceforge.net

> Will incorporate that fix.

Something like this:

--- amavisd~ 2011-01-25 19:18:05.000000000 +0100
+++ amavisd 2011-01-26 16:26:14.000000000 +0100
@@ -16674,8 +16674,9 @@
   require Exporter;
   use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION
- $have_sasl $ldap_sys_default);
+ $have_sasl $have_sasl_xs $ldap_sys_default);
   $VERSION = '2.220';
   @ISA = qw(Exporter);
   $have_sasl = eval { require Authen::SASL };
+ $have_sasl_xs = $have_sasl && eval { require Authen::SASL::XS };
   import Amavis::Conf qw(:platform :confvars c cr ca);
   import Amavis::Util qw(ll do_log);
@@ -16771,10 +16772,10 @@
       }
     }
- if ($self->{bind_dn}) { # bind required
+ if ($self->{bind_dn} || $self->{sasl}) { # bind required
       my($sasl);
       my($passw) = $self->{bind_password};
       if ($self->{sasl}) { # using SASL to authenticate?
- $have_sasl or
- die "connect_to_ldap: SASL requested but Authen::SASL not available";
+ $have_sasl or die "ldap: SASL requested but no Authen::SASL";
+ $have_sasl_xs or die "ldap: SASL requested but no Authen::SASL::XS";
         $sasl = Authen::SASL->new(mechanism => $self->{sasl_mech},
                                   callback => { user => $self->{sasl_auth_id},

Mark

------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
AMaViS-user mailing list
AMaViS-user@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/amavis-user
 Please visit http://www.ijs.si/software/amavisd/ regularly
 For administrativa requests please send email to rainer at openantivirus dot org