From: rettenbe Date: Wed, 19 Mar 2008 14:37:34 +0000 (+0000) Subject: client without gotoHardwareChecksum do not get a detect hardware msg X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1805d05b5b099f7deffc10c0894338c1912ed9d5;p=gosa.git 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 e69d6e620..0b106ae04 100755 --- 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 1790f9990..f925b86ee 100644 --- 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 c5ec45bad..6158e87f2 100755 --- 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; }