gunnar: server/perl-kolab/perl-kolab/lib/Kolab LDAP.pm,1.6,1.7

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/perl-kolab/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv32746/perl-kolab/perl-kolab/lib/Kolab

Modified Files:
	LDAP.pm 
Log Message:
        kolab/issue977  (Kolab suppresses ldap error messages)
        kolab/issue978  (incorrect ->abandon; call)


Index: LDAP.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab/lib/Kolab/LDAP.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- LDAP.pm	28 Jun 2010 08:54:22 -0000	1.6
+++ LDAP.pm	17 Jul 2010 13:43:09 -0000	1.7
@@ -321,7 +321,7 @@
         timeout => 20,
         async   => $as,
 	verify => 'none',
-	onerror => 'undef'
+	onerror => \&ldap_error
       );
     } else {
       $ldap = Net::LDAP->new(
@@ -330,7 +330,7 @@
         version => 3,
         timeout => 20,
         async   => $as,
-	onerror => 'undef'
+	onerror => \&ldap_error
       );
     }
     if (!$ldap) {
@@ -356,7 +356,6 @@
     my $ldap = shift;
 
     if (defined($ldap) && ($ldap->isa('Net::LDAP') || $ldap->isa('Net::LDAPS'))) {
-        $ldap->abandon;
         $ldap->unbind;
         $ldap->disconnect;
     }
@@ -1007,6 +1006,14 @@
     my @tab = ('.', '/', 0 .. 9, 'A' .. 'Z', 'a' .. 'z');
 
     return join "", @tab[ map {rand 64} (1 .. $length) ];
+}
+
+sub ldap_error {
+    my $mesg = shift;
+    my $errstr = $mesg->dn || '';
+    $errstr .= ": " if $errstr;
+    $errstr .= $mesg->error if $mesg->error;
+    Kolab::log('L', $errstr, KOLAB_ERROR);
 }