client without gotoHardwareChecksum do not get a detect hardware msg

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9944 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index e69d6e620c5469888e7b95801477d075b63764a2..0b106ae047c2659bea20d8ab8e0dc97e43a7ad8c 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -1401,7 +1401,7 @@ sub change_fai_state {
             }
 
           } else {
-            daemon_log("$session_id DEBUG FAIstate at host found with filter statement '$search' already at state '$st'", 7); 
+            daemon_log("$session_id DEBUG FAIstate at host '$_' already at state '$st'", 7); 
           }  
         }
       }

diff --git a/gosa-si/modules/SIPackages.pm b/gosa-si/modules/SIPackages.pm
index 1790f9990318ac1e4bec13487a76599c3e43f429..f925b86ee7df06ec98346e3a519be6457402fe69 100644 (file)
--- a/gosa-si/modules/SIPackages.pm
+++ b/gosa-si/modules/SIPackages.pm
@@ -884,6 +884,8 @@ sub hardware_config {
                        }
                } else {
                        &main::daemon_log("$session_id WARNING: there is no 'gotoHardwareChecksum' found in LDAP for host '$macaddress'", 3); 
+                       # Noting to do, only trigger hardware detection if no entry found in LDAP
+                       return;
                }
        } 
 

diff --git a/gosa-si/tests/log-parser.pl b/gosa-si/tests/log-parser.pl
index c5ec45badd0ec01e55eab1efbca10beeefe25a33..6158e87f2bc264032d7f57199037b12c5f776162 100755 (executable)
--- a/gosa-si/tests/log-parser.pl
+++ b/gosa-si/tests/log-parser.pl
@@ -74,7 +74,7 @@ sub check_session {
                        return $line;
                } else { $within_session = 0; }
        } else {
-               if ($within_session == 1) {     return $line; } 
+               if ($within_session == 1) { return $line; } 
        }
        return;
 }