From 5a82dbaeac461c700b6760ca2c241958006f4e5a Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 28 Mar 2008 11:55:32 +0000
Subject: [PATCH] Workaround for broken LDAP connectivity

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10056 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-si/gosa-si-server | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index bafe7e470..507c833c7 100755
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -1295,32 +1295,32 @@ sub get_ldap_handle {
 	my $heap;
 	my $ldap_handle;
 
-    if (not defined $session_id ) { $session_id = 0 };
+	if (not defined $session_id ) { $session_id = 0 };
 
 	if ($session_id == 0) {
-        daemon_log("$session_id DEBUG: get_ldap_handle invoked without a session_id, create a new ldap_handle", 7); 
-        $ldap_handle = Net::LDAP->new( $ldap_uri );
+		daemon_log("$session_id DEBUG: get_ldap_handle invoked without a session_id, create a new ldap_handle", 7); 
+		$ldap_handle = Net::LDAP->new( $ldap_uri );
 		$ldap_handle->bind($ldap_admin_dn, password => $ldap_admin_password); 
 
 	} else {
-        my $session_reference = $global_kernel->ID_id_to_session($session_id);
-        if( defined $session_reference ) {
-            $heap = $session_reference->get_heap();
-        }
+		my $session_reference = $global_kernel->ID_id_to_session($session_id);
+		if( defined $session_reference ) {
+			$heap = $session_reference->get_heap();
+		}
 
-        if (not defined $heap) {
-            daemon_log("$session_id DEBUG: cannot get heap for session_id '$session_id'", 7); 
-            return;
-        }
+		if (not defined $heap) {
+			daemon_log("$session_id DEBUG: cannot get heap for session_id '$session_id'", 7); 
+			return;
+		}
 
-        if (not exists $heap->{ldap_handle}) {
-            # create new ldap handle
-            $ldap_handle = Net::LDAP->new( $ldap_uri );
+		# TODO: This "if" is nonsense, because it doesn't prove that the
+                #       used handle is still valid - or if we've to reconnect...
+		#if (not exists $heap->{ldap_handle}) {
+			$ldap_handle = Net::LDAP->new( $ldap_uri );
 			$ldap_handle->bind($ldap_admin_dn, password => $ldap_admin_password); 
-            # add ldap handle to heap
-            $heap->{ldap_handle} = $ldap_handle;
-        }
-    }
+			$heap->{ldap_handle} = $ldap_handle;
+		#}
+	}
 	return $ldap_handle;
 }
 
-- 
2.30.2