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

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/perl-kolab/Kolab-LDAP
In directory doto:/tmp/cvs-serv18968/perl-kolab/Kolab-LDAP

Modified Files:
	LDAP.pm 
Log Message:
smptd policy server honors "delegate" property, master/slave comm. is completely "SSL-ified" now

Index: LDAP.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- LDAP.pm	14 Jun 2004 02:13:03 -0000	1.6
+++ LDAP.pm	17 Jun 2004 02:49:14 -0000	1.7
@@ -23,6 +23,7 @@
 use strict;
 use warnings;
 use Net::LDAP;
+use Net::LDAPS;
 use DB_File;
 use Kolab;
 use Kolab::Util;
@@ -99,13 +100,26 @@
 
     Kolab::log('L', "Connecting to LDAP server `$ip:$pt'");
 
-    my $ldap = Net::LDAP->new(
+    my $ldap;
+    if( $pt == 636 ) {
+      # Use SSL
+      $ldap = Net::LDAPS->new(
         $ip,
         port    => $pt,
         version => 3,
         timeout => 5,
         async   => $as,
-    );
+	verify => 'none'
+      );
+    } else {
+      $ldap = Net::LDAP->new(
+        $ip,
+        port    => $pt,
+        version => 3,
+        timeout => 5,
+        async   => $as,
+      );
+    }
     if (!$ldap) {
         Kolab::log('L', "Unable to connect to LDAP server `$ip:$pt'", KOLAB_ERROR);
         if ($as) { return 0; } else { exit(1); }
@@ -128,7 +142,7 @@
 {
     my $ldap = shift;
 
-    if (defined($ldap) && $ldap->isa('Net::LDAP')) {
+    if (defined($ldap) && ($ldap->isa('Net::LDAP') || $ldap->isa('Net::LDAPS'))) {
         $ldap->abandon;
         $ldap->unbind;
         $ldap->disconnect;