[Catalyst-commits] r12169 - in trunk/Catalyst-Model-LDAP: . lib/Catalyst/Model

[dwc at dev.catalyst.perl.org]

Author: dwc
Date: 2009-12-03 21:08:09 +0000 (Thu, 03 Dec 2009)
New Revision: 12169

Modified:
   trunk/Catalyst-Model-LDAP/Changes
   trunk/Catalyst-Model-LDAP/lib/Catalyst/Model/LDAP.pm
Log:
Update ACCEPT_CONTEXT method to remove Catalyst-specific parameters, which broke anonymous Net::LDAP::bind operations

Modified: trunk/Catalyst-Model-LDAP/Changes
===================================================================
--- trunk/Catalyst-Model-LDAP/Changes	2009-12-03 17:15:17 UTC (rev 12168)
+++ trunk/Catalyst-Model-LDAP/Changes	2009-12-03 21:08:09 UTC (rev 12169)
@@ -1,8 +1,12 @@
 Revision history for Perl extension Catalyst::Model::LDAP.
+
+0.17
         - Fix a problem when the Entry and Connection classes
           live under the same app namespace, when COMPONENT gets
           called from Catalyst, Net::LDAP::Entry dies because
-          $self is not a ref.
+          $self is not a reference
+        - Update ACCEPT_CONTEXT method to remove Catalyst-specific
+          parameters, which broke anonymous Net::LDAP::bind operations
           
 0.16  Wed Feb 20 19:17:04 EST 2008
         - Fix Catalyst::Model::LDAP::Entry's constructor

Modified: trunk/Catalyst-Model-LDAP/lib/Catalyst/Model/LDAP.pm
===================================================================
--- trunk/Catalyst-Model-LDAP/lib/Catalyst/Model/LDAP.pm	2009-12-03 17:15:17 UTC (rev 12168)
+++ trunk/Catalyst-Model-LDAP/lib/Catalyst/Model/LDAP.pm	2009-12-03 21:08:09 UTC (rev 12169)
@@ -127,6 +127,10 @@
 
     my %args = %$self;
 
+    # Remove Catalyst-specific parameters (e.g. catalyst_component_name), which
+    # cause issues Net::LDAP
+    delete $args{$_} for (grep { /^_?catalyst/ } keys %args);
+
     my $class = $args{connection_class} || 'Catalyst::Model::LDAP::Connection';
     eval "require $class";
     die $@ if $@;