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

diff --git a/gosa-si/server/events/siTriggered.pm b/gosa-si/server/events/siTriggered.pm
index 488cc14f1..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);
+    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,18 +137,18 @@ 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
-	&main::refresh_ldap_handle();
-	if( not defined $main::ldap_handle ) {
-		&main::daemon_log("ERROR: cannot connect to ldap: $ldap_uri", 1);
+    my $ldap_handle = &main::get_ldap_handle($session_id);
+	if( not defined $ldap_handle ) {
+		&main::daemon_log("$session_id ERROR: cannot connect to ldap: $ldap_uri", 1);
 		return;
 	} 
 
 	# Perform search
-	$mesg = $main::ldap_handle->search(
+	$mesg = $ldap_handle->search(
 		base   => $ldap_base,
 		scope  => 'sub',
 		filter => "(&(objectClass=GOhard)(|(macAddress=$macaddress)(dhcpHWaddress=ethernet $macaddress)))"
@@ -156,9 +156,18 @@ sub detected_hardware {
 
 	# We need to create a base entry first (if not done from ArpHandler)
 	if($mesg->count == 0) {
-		&main::daemon_log("INFO: Need to create a new LDAP Entry for client $address", 6);
+		&main::daemon_log("INFO: Need to create a new LDAP Entry for client $address", 4);
 		my $ipaddress= $1 if $address =~ /^([0-9\.]*?):.*$/;
-		my $dnsname= gethostbyaddr(inet_aton($ipaddress), AF_INET) || $ipaddress;
+		my $dnsname;
+		if (defined($msg_hash->{'force-hostname'}) && 
+			defined($msg_hash->{'force-hostname'}[0]) &&
+			length($msg_hash->{'force-hostname'}[0]) > 0){
+			$dnsname= $msg_hash->{'force-hostname'}[0];
+			&main::daemon_log("INFO: Using forced hostname $dnsname for client $address", 4);
+		} else {
+			$dnsname= gethostbyaddr(inet_aton($ipaddress), AF_INET) || $ipaddress;
+		}
+
 		my $cn = (($dnsname =~ /^(\d){1,3}\.(\d){1,3}\.(\d){1,3}\.(\d){1,3}/) ? $dnsname : sprintf "%s", $dnsname =~ /([^\.]+)\.?/);
 		my $dn = "cn=$cn,ou=incoming,$ldap_base";
 		&main::daemon_log("INFO: Creating entry for $dn",5);
@@ -174,14 +183,14 @@ sub detected_hardware {
 			$entry->add("objectClass" => "gosaAdministrativeUnitTag");
 			$entry->add("gosaUnitTag" => $main::gosa_unit_tag);
 		}
-		my $res=$entry->update($main::ldap_handle);
+		my $res=$entry->update($ldap_handle);
 		if(defined($res->{'errorMessage'}) &&
 			length($res->{'errorMessage'}) >0) {
 			&main::daemon_log("ERROR: can not add entries to LDAP: ".$res->{'errorMessage'}, 1);
 			return;
 		} else {
 			# Fill $mesg again
-			$mesg = $main::ldap_handle->search(
+			$mesg = $ldap_handle->search(
 				base   => $ldap_base,
 				scope  => 'sub',
 				filter => "(&(objectClass=GOhard)(|(macAddress=$macaddress)(dhcpHWaddress=ethernet $macaddress)))"
@@ -199,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});	
@@ -210,15 +219,15 @@ 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);
 				}
 			}
 		}
 
-		my $res=$entry->update($main::ldap_handle);
+		my $res=$entry->update($ldap_handle);
 		if(defined($res->{'errorMessage'}) &&
 			length($res->{'errorMessage'}) >0) {
 			&main::daemon_log("ERROR: can not add entries to LDAP: ".$res->{'errorMessage'}, 1);
@@ -235,9 +244,9 @@ sub trigger_wake {
     my ($msg, $msg_hash, $session_id) = @_ ;
 
     foreach (@{$msg_hash->{macAddress}}){
-        &main::daemon_log("INFO: trigger wake for $_", 5);
-        my $host    = shift;
-        my $ipaddr  = shift || '255.255.255.255';
+        &main::daemon_log("$session_id INFO: trigger wake for $_", 5);
+        my $host    = $_;
+        my $ipaddr  = '255.255.255.255';
         my $port    = getservbyname('discard', 'udp');
 
         my ($raddr, $them, $proto);
@@ -246,20 +255,9 @@ sub trigger_wake {
         # get the hardware address (ethernet address)
         $hwaddr_re = join(':', ('[0-9A-Fa-f]{1,2}') x 6);
         if ($host =~ m/^$hwaddr_re$/) {
-                $hwaddr = $host;
+          $hwaddr = $host;
         } else {
-                # $host is not a hardware address, try to resolve it
-                my $ip_re = join('\.', ('([0-9]|[1-9][0-9]|1[0-9]{2}|2([0-4][0-9]|5[0-5]))') x 4);
-                my $ip_addr;
-                if ($host =~ m/^$ip_re$/) {
-                        $ip_addr = $host;
-                } else {
-                        my $h;
-                        unless ($h = gethost($host)) {
-                                return undef;
-                        }
-                        $ip_addr = inet_ntoa($h->addr);
-                }
+          &main::daemon_log("$session_id ERROR: trigger_wake called with non mac address", 1);
         }
 
         # Generate magic sequence
@@ -270,7 +268,7 @@ sub trigger_wake {
 
         # Allocate socket and send packet
 
-        $raddr = gethostbyname($ipaddr)->addr;
+        $raddr = gethostbyname($ipaddr);
         $them = pack_sockaddr_in($port, $raddr);
         $proto = getprotobyname('udp');