[perl-ldap-checkins] CVS: ldap/lib/Net/LDAP Bind.pm,1.2,1.3

[Graham B. <gb...@us...>]

Update of /cvsroot/perl-ldap/ldap/lib/Net/LDAP
In directory usw-pr-cvs1:/tmp/cvs-serv5539/lib/Net/LDAP

Modified Files:
	Bind.pm 
Log Message:
Change over to using Authen::SASL v2.00, which is now distributed
in a separate distribution


Index: Bind.pm
===================================================================
RCS file: /cvsroot/perl-ldap/ldap/lib/Net/LDAP/Bind.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Bind.pm	31 Jan 2001 11:44:03 -0000	1.2
+++ Bind.pm	18 Feb 2002 16:51:42 -0000	1.3
@@ -5,7 +5,7 @@
 package Net::LDAP::Bind;
 
 use strict;
-use Net::LDAP qw(LDAP_SASL_BIND_IN_PROGRESS LDAP_DECODING_ERROR);
+use Net::LDAP qw(LDAP_SASL_BIND_IN_PROGRESS LDAP_DECODING_ERROR LDAP_SUCCESS);
 use Net::LDAP::Message;
 use vars qw(@ISA);
 
@@ -23,18 +23,22 @@
      or $self->set_error(LDAP_DECODING_ERROR,"LDAP decode error")
     and return;
 
+  my $sasl = $self->{sasl};
+  my $ldap = $self->parent;
+
+  $ldap->{net_ldap_socket} = $sasl->securesocket($ldap->{net_ldap_socket})
+    if $sasl and $bind->{resultCode} == LDAP_SUCCESS;
+
   return $self->SUPER::decode($result)
     unless $bind->{resultCode} == LDAP_SASL_BIND_IN_PROGRESS;
 
   # tell our LDAP client to forget us as this message has now completed
   # all communications with the server
-  $self->parent->_forgetmesg($self);
+  $ldap->_forgetmesg($self);
 
   $self->{mesgid} = Net::LDAP::Message->NewMesgID(); # Get a new message ID
 
-  my $sasl = $self->{sasl};
-  my $ldap = $self->parent;
-  my $resp = $sasl->challenge($bind->{serverSaslCreds});
+  my $resp = $sasl->client_step($bind->{serverSaslCreds});
 
   $self->encode(
     bindRequest => {
@@ -42,7 +46,7 @@
     name    => $self->{dn},
     authentication => {
       sasl    => {
-        mechanism   => $sasl->name,
+        mechanism   => $sasl->mechanism,
         credentials => $resp
       }
     },