Code

update: add debug line in func get_ldap_handle() if connection to ldap is not possible
authorrettenbe <rettenbe@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 23 Sep 2008 08:43:25 +0000 (08:43 +0000)
committerrettenbe <rettenbe@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 23 Sep 2008 08:43:25 +0000 (08:43 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12536 594d385d-05f5-0310-b6e9-bd551577e9d8

gosa-si/gosa-si-server

index 7d91b4dc422b1ebd2ea0c81f1a863512a155c735..e8abf699299c94ff63895383fd1b8d98302903c0 100755 (executable)
@@ -455,7 +455,7 @@ sub import_modules {
         eval { require $file; };
         if ($@) {
             daemon_log("0 ERROR: gosa-si-server could not load module $file", 1);
-            daemon_log("$@", 5);
+            daemon_log("$@", 1);
                } else {
                        my $info = eval($mod_name.'::get_module_info()');
                        # Only load module if get_module_info() returns a non-null object
@@ -2072,7 +2072,11 @@ sub get_ldap_handle {
        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 );
-               $ldap_handle->bind($ldap_admin_dn, password => $ldap_admin_password) or daemon_log("$session_id ERROR: Bind to LDAP $ldap_uri as $ldap_admin_dn failed!"); 
+               if (defined $ldap_handle) {
+                       $ldap_handle->bind($ldap_admin_dn, password => $ldap_admin_password) or daemon_log("$session_id ERROR: Bind to LDAP $ldap_uri as $ldap_admin_dn failed!"); 
+               } else {
+                       daemon_log("$session_id ERROR: creation of a new LDAP handle failed (ldap_uri '$ldap_uri')");
+               }
 
        } else {
                my $session_reference = $global_kernel->ID_id_to_session($session_id);