Don't send ldap config if disabled

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

diff --git a/gosa-si/modules/SIPackages.pm b/gosa-si/modules/SIPackages.pm
index 19a4dfcac8e74cbea03a628f789abfddc6eb8aa5..b038e39635d4e8103c977c0f6fece1c5375a18c4 100644 (file)
--- a/gosa-si/modules/SIPackages.pm
+++ b/gosa-si/modules/SIPackages.pm
@@ -644,10 +644,11 @@ sub who_has_i_do {
     print "\ngot msg $header:\nserver $source has client with $search_param $search_value\n";
 }
 
+
 #===  FUNCTION  ================================================================
 #         NAME:  new_ldap_config
 #   PARAMETERS:  address - string - ip address and port of a host
-#      RETURNS:  nothing
+#      RETURNS:  gosa-si conform message
 #  DESCRIPTION:  send to address the ldap configuration found for dn gotoLdapServer
 #===============================================================================
 sub new_ldap_config {
@@ -682,7 +683,7 @@ sub new_ldap_config {
        $mesg = $main::ldap_handle->search( base   => $ldap_base,
                scope  => 'sub',
                attrs => ['dn', 'gotoLdapServer', 'gosaUnitTag', 'FAIclass'],
-               filter => "(&(objectClass=GOhard)(macaddress=$macaddress))");
+               filter => "(&(objectClass=GOhard)(macaddress=$macaddress)(gotoMode=active))");
        #$mesg->code && die $mesg->error;
        if($mesg->code) {
                &main::daemon_log($mesg->error, 1);
@@ -691,7 +692,7 @@ sub new_ldap_config {
 
        # Sanity check
        if ($mesg->count != 1) {
-               &main::daemon_log("WARNING: client mac address $macaddress not found/not unique in ldap search", 1);
+               &main::daemon_log("WARNING: client with mac address $macaddress not found/unique/active - not sending ldap config", 1);
                &main::daemon_log("\tbase: $ldap_base", 1);
                &main::daemon_log("\tscope: sub", 1);
                &main::daemon_log("\tattrs: dn, gotoLdapServer", 1);