X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fserver%2Fevents%2FsiTriggered.pm;h=544e2e6ab9c96ab9ac2c0b604781c585976c65fa;hb=5e702a8304a79ec8eedb695efb79fe0cd3e531ef;hp=104cd8f1fbf1d9f9e1299c96f45ceba2b5488e80;hpb=d85e06e6826defb93de1f1c494d4bedf090c1c78;p=gosa.git

diff --git a/gosa-si/server/events/siTriggered.pm b/gosa-si/server/events/siTriggered.pm
index 104cd8f1f..544e2e6ab 100644
--- a/gosa-si/server/events/siTriggered.pm
+++ b/gosa-si/server/events/siTriggered.pm
@@ -47,7 +47,7 @@ sub read_configfile {
     my ($cfg_file, %cfg_defaults) = @_;
     my $cfg;
 
-    if( defined( $cfg_file) && ( length($cfg_file) > 0 )) {
+    if( defined( $cfg_file) && ( (-s $cfg_file) > 0 )) {
         if( -r $cfg_file ) {
             $cfg = Config::IniFiles->new( -file => $cfg_file );
         } else {
@@ -70,7 +70,7 @@ sub reload_ldap_config {
     my $header = @{$msg_hash->{header}}[0];
     my $target = @{$msg_hash->{$header}}[0];
 
-    my $out_msg = &SIPackages::new_ldap_config($target, $session_id);
+    my $out_msg = &ClientPackages::new_ldap_config($target, $session_id);
     my @out_msg_l = ( $out_msg );
     return @out_msg_l;
 }
@@ -129,7 +129,7 @@ sub detected_hardware {
 	# check hit
 	my $hit_counter = keys %{$res};
 	if( not $hit_counter == 1 ) {
-		&main::daemon_log("ERROR: more or no hit found in known_clients_db by query by '$address'", 1);
+		&main::daemon_log("$session_id ERROR: more or no hit found in known_clients_db by query by '$address'", 1);
 		return;
 	}
 
@@ -137,13 +137,13 @@ sub detected_hardware {
 	my $hostkey = $res->{1}->{hostkey};
 
 	if (not defined $macaddress) {
-		&main::daemon_log("ERROR: no mac address found for client $address", 1);
+		&main::daemon_log("$session_id ERROR: no mac address found for client $address", 1);
 		return;
 	}
 	# Build LDAP connection
     my $ldap_handle = &main::get_ldap_handle($session_id);
 	if( not defined $ldap_handle ) {
-		&main::daemon_log("ERROR: cannot connect to ldap: $ldap_uri", 1);
+		&main::daemon_log("$session_id ERROR: cannot connect to ldap: $ldap_uri", 1);
 		return;
 	} 
 
@@ -208,7 +208,7 @@ sub detected_hardware {
 			if(defined($msg_hash->{detected_hardware}[0]->{$attribute}) &&
 				length($msg_hash->{detected_hardware}[0]->{$attribute}) >0 ) {
 				if(defined($entry->get_value($attribute))) {
-					$entry->delete($attribute);
+					$entry->delete($attribute => []);
 				}
 				&main::daemon_log("INFO: Adding attribute $attribute with value ".$msg_hash->{detected_hardware}[0]->{$attribute},5);
 				$entry->add($attribute => $msg_hash->{detected_hardware}[0]->{$attribute});	
@@ -219,9 +219,9 @@ sub detected_hardware {
 			if(defined($msg_hash->{detected_hardware}[0]->{$attribute}) &&
 				length($msg_hash->{detected_hardware}[0]->{$attribute}) >0 ) {
 				if(defined($entry->get_value($attribute))) {
-					$entry->delete($attribute);
+					$entry->delete($attribute => []);
 				}
-				foreach my $array_entry (@{$msg_hash->{detected_hardware}[0]->{$attribute}}) {
+				foreach my $array_entry (keys %{{map { $_ => 1 } sort(@{$msg_hash->{detected_hardware}[0]->{$attribute}}) }}) {
 					$entry->add($attribute => $array_entry);
 				}
 			}