index c6728266c59d97bc5f8edb3f469b8060e27c0232..5f7e731727eb7c3a20dbde9c0210b9a0b285dd38 100644 (file)
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 {
my $header = @{$msg_hash->{header}}[0];
my $target = @{$msg_hash->{$header}}[0];
- my $out_msg = &SIPackages::new_ldap_config($target);
+ my $out_msg = &SIPackages::new_ldap_config($target, $session_id);
my @out_msg_l = ( $out_msg );
return @out_msg_l;
}
# 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;
}
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)))"
$dnsname= $msg_hash->{'force-hostname'}[0];
&main::daemon_log("INFO: Using forced hostname $dnsname for client $address", 4);
} else {
- gethostbyaddr(inet_aton($ipaddress), AF_INET) || $ipaddress;
+ $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 =~ /([^\.]+)\.?/);
$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)))"
if(defined($entry->get_value($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);
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);
# 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
# Allocate socket and send packet
- $raddr = gethostbyname($ipaddr)->addr;
+ $raddr = gethostbyname($ipaddr);
$them = pack_sockaddr_in($port, $raddr);
$proto = getprotobyname('udp');